diff --git a/apps/emqx_web_hook/src/emqx_web_hook.app.src b/apps/emqx_web_hook/src/emqx_web_hook.app.src index cf1d53984..35c0489f9 100644 --- a/apps/emqx_web_hook/src/emqx_web_hook.app.src +++ b/apps/emqx_web_hook/src/emqx_web_hook.app.src @@ -1,6 +1,6 @@ {application, emqx_web_hook, [{description, "EMQX WebHook Plugin"}, - {vsn, "4.3.18"}, % strict semver, bump manually! + {vsn, "4.3.19"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_web_hook_sup]}, {applications, [kernel,stdlib,ehttpc]}, diff --git a/apps/emqx_web_hook/src/emqx_web_hook.appup.src b/apps/emqx_web_hook/src/emqx_web_hook.appup.src index cf4f5235d..865dfa233 100644 --- a/apps/emqx_web_hook/src/emqx_web_hook.appup.src +++ b/apps/emqx_web_hook/src/emqx_web_hook.appup.src @@ -1,13 +1,20 @@ %% -*- mode: erlang -*- %% Unless you know what you are doing, DO NOT edit manually!! {VSN, - [{"4.3.17",[{load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]}, - {"4.3.16",[{load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]}, + [{"4.3.18",[{load_module,emqx_web_hook,brutal_purge,soft_purge,[]}]}, + {"4.3.17", + [{load_module,emqx_web_hook,brutal_purge,soft_purge,[]}, + {load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]}, + {"4.3.16", + [{load_module,emqx_web_hook,brutal_purge,soft_purge,[]}, + {load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]}, {"4.3.15", - [{load_module,emqx_web_hook_app,brutal_purge,soft_purge,[]}, + [{load_module,emqx_web_hook,brutal_purge,soft_purge,[]}, + {load_module,emqx_web_hook_app,brutal_purge,soft_purge,[]}, {load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]}, {"4.3.14", - [{load_module,emqx_web_hook_app,brutal_purge,soft_purge,[]}, + [{load_module,emqx_web_hook,brutal_purge,soft_purge,[]}, + {load_module,emqx_web_hook_app,brutal_purge,soft_purge,[]}, {load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]}, {<<"4\\.3\\.[0-7]">>, [{apply,{application,stop,[emqx_web_hook]}}, @@ -31,16 +38,24 @@ {load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}, {load_module,emqx_web_hook,brutal_purge,soft_purge,[]}]}, {<<"4\\.3\\.1[2-4]">>, - [{load_module,emqx_web_hook_app,brutal_purge,soft_purge,[]}, + [{load_module,emqx_web_hook,brutal_purge,soft_purge,[]}, + {load_module,emqx_web_hook_app,brutal_purge,soft_purge,[]}, {load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]}, {<<".*">>,[]}], - [{"4.3.17",[{load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]}, - {"4.3.16",[{load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]}, + [{"4.3.18",[{load_module,emqx_web_hook,brutal_purge,soft_purge,[]}]}, + {"4.3.17", + [{load_module,emqx_web_hook,brutal_purge,soft_purge,[]}, + {load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]}, + {"4.3.16", + [{load_module,emqx_web_hook,brutal_purge,soft_purge,[]}, + {load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]}, {"4.3.15", - [{load_module,emqx_web_hook_app,brutal_purge,soft_purge,[]}, + [{load_module,emqx_web_hook,brutal_purge,soft_purge,[]}, + {load_module,emqx_web_hook_app,brutal_purge,soft_purge,[]}, {load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]}, {"4.3.14", - [{load_module,emqx_web_hook_app,brutal_purge,soft_purge,[]}, + [{load_module,emqx_web_hook,brutal_purge,soft_purge,[]}, + {load_module,emqx_web_hook_app,brutal_purge,soft_purge,[]}, {load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]}, {<<"4\\.3\\.[0-7]">>, [{apply,{application,stop,[emqx_web_hook]}}, @@ -64,6 +79,7 @@ {load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}, {load_module,emqx_web_hook,brutal_purge,soft_purge,[]}]}, {<<"4\\.3\\.1[2-4]">>, - [{load_module,emqx_web_hook_app,brutal_purge,soft_purge,[]}, + [{load_module,emqx_web_hook,brutal_purge,soft_purge,[]}, + {load_module,emqx_web_hook_app,brutal_purge,soft_purge,[]}, {load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]}, {<<".*">>,[]}]}. diff --git a/apps/emqx_web_hook/src/emqx_web_hook.erl b/apps/emqx_web_hook/src/emqx_web_hook.erl index 94b0f725b..708c86f23 100644 --- a/apps/emqx_web_hook/src/emqx_web_hook.erl +++ b/apps/emqx_web_hook/src/emqx_web_hook.erl @@ -91,10 +91,8 @@ on_client_connect(ConnInfo = #{clientid := ClientId, username := Username, peern , clientid => ClientId , username => maybe(Username) , ipaddress => iolist_to_binary(ntoa(Peerhost)) - , keepalive => maps:get(keepalive, ConnInfo) - , proto_ver => maps:get(proto_ver, ConnInfo) }, - send_http_request(ClientId, Params). + send_http_request(ClientId, add_optional_conn_fields(Params, ConnInfo)). %%-------------------------------------------------------------------- %% Client connack @@ -107,12 +105,9 @@ on_client_connack(ConnInfo = #{clientid := ClientId, username := Username, peern , clientid => ClientId , username => maybe(Username) , ipaddress => iolist_to_binary(ntoa(Peerhost)) - , keepalive => maps:get(keepalive, ConnInfo) - , proto_ver => maps:get(proto_ver, ConnInfo) - , connected_at => maps:get(connected_at, ConnInfo) , conn_ack => Rc }, - send_http_request(ClientId, Params). + send_http_request(ClientId, add_optional_conn_fields(Params, ConnInfo)). %%-------------------------------------------------------------------- %% Client connected @@ -125,11 +120,8 @@ on_client_connected(#{clientid := ClientId, username := Username, peerhost := Pe , clientid => ClientId , username => maybe(Username) , ipaddress => iolist_to_binary(ntoa(Peerhost)) - , keepalive => maps:get(keepalive, ConnInfo) - , proto_ver => maps:get(proto_ver, ConnInfo) - , connected_at => maps:get(connected_at, ConnInfo) }, - send_http_request(ClientId, Params). + send_http_request(ClientId, add_optional_conn_fields(Params, ConnInfo)). %%-------------------------------------------------------------------- %% Client disconnected @@ -387,3 +379,6 @@ stringfy(Term) -> maybe(undefined) -> null; maybe(Str) -> Str. + +add_optional_conn_fields(Fields, ConnInfo) -> + maps:merge(Fields, maps:with([keepalive, proto_ver, connected_at], ConnInfo)).