yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename 'client_id' field to 'clientid'

This commit is contained in:
zhouzb 2019-09-29 16:46:27 +08:00
parent ddd68e600d
commit d004a5b68e
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/emqx.hrl
View File

@ -154,7 +154,7 @@
%% Banned %% Banned
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
-type(banned_who() :: {client_id, binary()} -type(banned_who() :: {clientid, binary()}
| {username, binary()} | {username, binary()}
| {ip_address, inet:ip_address()}). | {ip_address, inet:ip_address()}).

6
priv/emqx.schema
View File

@ -524,10 +524,10 @@ end}.
Formatter = {emqx_logger_formatter, Formatter = {emqx_logger_formatter,
#{template => #{template =>
[time," [",level,"] ", [time," [",level,"] ",
{client_id, {clientid,
[{peername, [{peername,
[client_id,"@",peername," "], [clientid,"@",peername," "],
[client_id, " "]}], [clientid, " "]}],
[{peername, [{peername,
[peername," "], [peername," "],
[]}]}, []}]},

2
test/emqx_SUITE.erl
View File

@ -43,7 +43,7 @@ t_get_env(_) ->
t_emqx_pubsub_api(_) -> t_emqx_pubsub_api(_) ->
emqx:start(), emqx:start(),
true = emqx:is_running(node()), true = emqx:is_running(node()),
{ok, C} = emqtt:start_link([{host, "localhost"}, {client_id, "myclient"}]), {ok, C} = emqtt:start_link([{host, "localhost"}, {clientid, "myclient"}]),
{ok, _} = emqtt:connect(C), {ok, _} = emqtt:connect(C),
ClientId = <<"myclient">>, ClientId = <<"myclient">>,
Topic = <<"mytopic">>, Topic = <<"mytopic">>,

4
test/emqx_request_responser_SUITE.erl
View File

@ -42,7 +42,7 @@ request_response_per_qos(QoS) ->
RspTopic = <<"response_topic">>, RspTopic = <<"response_topic">>,
{ok, Requester} = emqx_request_sender:start_link(RspTopic, QoS, {ok, Requester} = emqx_request_sender:start_link(RspTopic, QoS,
[{proto_ver, v5}, [{proto_ver, v5},
{client_id, <<"requester">>}, {clientid, <<"requester">>},
{properties, #{ 'Request-Response-Information' => 1}}]), {properties, #{ 'Request-Response-Information' => 1}}]),
%% This is a square service %% This is a square service
Square = fun(_CorrData, ReqBin) -> Square = fun(_CorrData, ReqBin) ->
@ -51,7 +51,7 @@ request_response_per_qos(QoS) ->
end, end,
{ok, Responser} = emqx_request_handler:start_link(ReqTopic, QoS, Square, {ok, Responser} = emqx_request_handler:start_link(ReqTopic, QoS, Square,
[{proto_ver, v5}, [{proto_ver, v5},
{client_id, <<"responser">>} {clientid, <<"responser">>}
]), ]),
ok = emqx_request_sender:send(Requester, ReqTopic, RspTopic, <<"corr-1">>, <<"2">>, QoS), ok = emqx_request_sender:send(Requester, ReqTopic, RspTopic, <<"corr-1">>, <<"2">>, QoS),
receive receive