chore: replace ip_port() wuth host_port() for all connectors
This commit is contained in:
parent
6581911d5c
commit
39ad172377
|
@ -345,7 +345,7 @@ init_worker_options([], Acc) ->
|
||||||
%% ===================================================================
|
%% ===================================================================
|
||||||
%% Schema funcs
|
%% Schema funcs
|
||||||
|
|
||||||
server(type) -> emqx_schema:ip_port();
|
server(type) -> emqx_schema:host_port();
|
||||||
server(required) -> true;
|
server(required) -> true;
|
||||||
server(validator) -> [?NOT_EMPTY("the value of the field 'server' cannot be empty")];
|
server(validator) -> [?NOT_EMPTY("the value of the field 'server' cannot be empty")];
|
||||||
server(converter) -> fun to_server_raw/1;
|
server(converter) -> fun to_server_raw/1;
|
||||||
|
|
|
@ -55,7 +55,7 @@ fields(config) ->
|
||||||
emqx_connector_schema_lib:ssl_fields() ++
|
emqx_connector_schema_lib:ssl_fields() ++
|
||||||
emqx_connector_schema_lib:prepare_statement_fields().
|
emqx_connector_schema_lib:prepare_statement_fields().
|
||||||
|
|
||||||
server(type) -> emqx_schema:ip_port();
|
server(type) -> emqx_schema:host_port();
|
||||||
server(required) -> true;
|
server(required) -> true;
|
||||||
server(validator) -> [?NOT_EMPTY("the value of the field 'server' cannot be empty")];
|
server(validator) -> [?NOT_EMPTY("the value of the field 'server' cannot be empty")];
|
||||||
server(converter) -> fun to_server/1;
|
server(converter) -> fun to_server/1;
|
||||||
|
|
|
@ -58,7 +58,7 @@ fields(config) ->
|
||||||
emqx_connector_schema_lib:ssl_fields() ++
|
emqx_connector_schema_lib:ssl_fields() ++
|
||||||
emqx_connector_schema_lib:prepare_statement_fields().
|
emqx_connector_schema_lib:prepare_statement_fields().
|
||||||
|
|
||||||
server(type) -> emqx_schema:ip_port();
|
server(type) -> emqx_schema:host_port();
|
||||||
server(required) -> true;
|
server(required) -> true;
|
||||||
server(validator) -> [?NOT_EMPTY("the value of the field 'server' cannot be empty")];
|
server(validator) -> [?NOT_EMPTY("the value of the field 'server' cannot be empty")];
|
||||||
server(converter) -> fun to_server/1;
|
server(converter) -> fun to_server/1;
|
||||||
|
|
|
@ -97,7 +97,7 @@ fields(sentinel) ->
|
||||||
redis_fields() ++
|
redis_fields() ++
|
||||||
emqx_connector_schema_lib:ssl_fields().
|
emqx_connector_schema_lib:ssl_fields().
|
||||||
|
|
||||||
server(type) -> emqx_schema:ip_port();
|
server(type) -> emqx_schema:host_port();
|
||||||
server(required) -> true;
|
server(required) -> true;
|
||||||
server(validator) -> [?NOT_EMPTY("the value of the field 'server' cannot be empty")];
|
server(validator) -> [?NOT_EMPTY("the value of the field 'server' cannot be empty")];
|
||||||
server(converter) -> fun to_server_raw/1;
|
server(converter) -> fun to_server_raw/1;
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
-include_lib("hocon/include/hoconsc.hrl").
|
-include_lib("hocon/include/hoconsc.hrl").
|
||||||
-include_lib("typerefl/include/types.hrl").
|
-include_lib("typerefl/include/types.hrl").
|
||||||
|
|
||||||
-type ip_port() :: tuple().
|
-type ip_port() :: tuple() | integer().
|
||||||
-type duration() :: non_neg_integer().
|
-type duration() :: non_neg_integer().
|
||||||
-type duration_s() :: non_neg_integer().
|
-type duration_s() :: non_neg_integer().
|
||||||
-type bytesize() :: pos_integer().
|
-type bytesize() :: pos_integer().
|
||||||
|
|
|
@ -21,8 +21,6 @@
|
||||||
|
|
||||||
-behaviour(hocon_schema).
|
-behaviour(hocon_schema).
|
||||||
|
|
||||||
-export([to_ip_port/1]).
|
|
||||||
|
|
||||||
-export([
|
-export([
|
||||||
namespace/0,
|
namespace/0,
|
||||||
roots/0,
|
roots/0,
|
||||||
|
@ -30,8 +28,6 @@
|
||||||
desc/1
|
desc/1
|
||||||
]).
|
]).
|
||||||
|
|
||||||
-typerefl_from_string({ip_port/0, emqx_statsd_schema, to_ip_port}).
|
|
||||||
|
|
||||||
namespace() -> "statsd".
|
namespace() -> "statsd".
|
||||||
|
|
||||||
roots() -> ["statsd"].
|
roots() -> ["statsd"].
|
||||||
|
@ -55,7 +51,7 @@ fields("statsd") ->
|
||||||
desc("statsd") -> ?DESC(statsd);
|
desc("statsd") -> ?DESC(statsd);
|
||||||
desc(_) -> undefined.
|
desc(_) -> undefined.
|
||||||
|
|
||||||
server(type) -> emqx_schema:ip_port();
|
server(type) -> emqx_schema:host_port();
|
||||||
server(required) -> true;
|
server(required) -> true;
|
||||||
server(default) -> "127.0.0.1:8125";
|
server(default) -> "127.0.0.1:8125";
|
||||||
server(desc) -> ?DESC(?FUNCTION_NAME);
|
server(desc) -> ?DESC(?FUNCTION_NAME);
|
||||||
|
@ -72,14 +68,3 @@ flush_interval(required) -> true;
|
||||||
flush_interval(default) -> "10s";
|
flush_interval(default) -> "10s";
|
||||||
flush_interval(desc) -> ?DESC(?FUNCTION_NAME);
|
flush_interval(desc) -> ?DESC(?FUNCTION_NAME);
|
||||||
flush_interval(_) -> undefined.
|
flush_interval(_) -> undefined.
|
||||||
|
|
||||||
to_ip_port(Str) ->
|
|
||||||
case string:tokens(Str, ":") of
|
|
||||||
[Ip, Port] ->
|
|
||||||
case inet:parse_address(Ip) of
|
|
||||||
{ok, R} -> {ok, {R, list_to_integer(Port)}};
|
|
||||||
_ -> {error, Str}
|
|
||||||
end;
|
|
||||||
_ ->
|
|
||||||
{error, Str}
|
|
||||||
end.
|
|
||||||
|
|
Loading…
Reference in New Issue