From c06984d847f2cb77f58173b0b3f052adff2034e7 Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Wed, 8 Mar 2023 14:31:54 +0800 Subject: [PATCH 1/4] fix: avoid replacing newlines with commas in log msg --- src/emqx_packet.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/emqx_packet.erl b/src/emqx_packet.erl index d91ac6f44..293d32121 100644 --- a/src/emqx_packet.erl +++ b/src/emqx_packet.erl @@ -438,7 +438,7 @@ format_variable(undefined, _) -> format_variable(Variable, undefined) -> format_variable(Variable); format_variable(Variable, Payload) -> - [format_variable(Variable), ", Payload=", Payload]. + [format_variable(Variable), io_lib:format(", Payload=~0p", [Payload])]. format_variable(#mqtt_packet_connect{ proto_ver = ProtoVer, From 53e04fc9502a7c0cb9b2a415245eee33c3806858 Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Wed, 8 Mar 2023 14:40:38 +0800 Subject: [PATCH 2/4] chore: update the emqx.appup.src --- changes/v4.4.16-en.md | 5 +++++ changes/v4.4.16-zh.md | 5 +++++ src/emqx.app.src | 2 +- src/emqx.appup.src | 12 ++++++++++-- 4 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 changes/v4.4.16-en.md create mode 100644 changes/v4.4.16-zh.md diff --git a/changes/v4.4.16-en.md b/changes/v4.4.16-en.md new file mode 100644 index 000000000..089ae46b3 --- /dev/null +++ b/changes/v4.4.16-en.md @@ -0,0 +1,5 @@ +# v4.4.16 + +## Enhancements + +## Bug fixes diff --git a/changes/v4.4.16-zh.md b/changes/v4.4.16-zh.md new file mode 100644 index 000000000..b111846d9 --- /dev/null +++ b/changes/v4.4.16-zh.md @@ -0,0 +1,5 @@ +# v4.4.16 + +## 增强 + +## 修复 diff --git a/src/emqx.app.src b/src/emqx.app.src index 4c082b971..5c59f8957 100644 --- a/src/emqx.app.src +++ b/src/emqx.app.src @@ -6,7 +6,7 @@ %% the emqx `release' version, which in turn is comprised of several %% apps, one of which is this. See `emqx_release.hrl' for more %% info. - {vsn, "4.4.15"}, % strict semver, bump manually! + {vsn, "4.4.16"}, % strict semver, bump manually! {modules, []}, {registered, []}, {applications, [ kernel diff --git a/src/emqx.appup.src b/src/emqx.appup.src index 3711c84d5..002878638 100644 --- a/src/emqx.appup.src +++ b/src/emqx.appup.src @@ -1,7 +1,11 @@ %% -*- mode: erlang -*- %% Unless you know what you are doing, DO NOT edit manually!! {VSN, - [{"4.4.14", + [{"4.4.15", + [{load_module,emqx_packet,brutal_purge,soft_purge,[]}, + {load_module,emqx_relup,brutal_purge,soft_purge,[]}, + {load_module,emqx_app,brutal_purge,soft_purge,[]}]}, + {"4.4.14", [{load_module,emqx_vm,brutal_purge,soft_purge,[]}, {load_module,emqx_keepalive,brutal_purge,soft_purge,[]}, {load_module,emqx_broker,brutal_purge,soft_purge,[]}, @@ -494,7 +498,11 @@ {apply,{application,set_env, [gen_rpc,insecure_auth_fallback_allowed,true]}}]}, {<<".*">>,[]}], - [{"4.4.14", + [{"4.4.15", + [{load_module,emqx_packet,brutal_purge,soft_purge,[]}, + {load_module,emqx_relup,brutal_purge,soft_purge,[]}, + {load_module,emqx_app,brutal_purge,soft_purge,[]}]}, + {"4.4.14", [{load_module,emqx_vm,brutal_purge,soft_purge,[]}, {load_module,emqx_keepalive,brutal_purge,soft_purge,[]}, {load_module,emqx_broker,brutal_purge,soft_purge,[]}, From 42288f6998ac453a5a49fdfd1932cdd37f763bf1 Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Wed, 8 Mar 2023 14:56:01 +0800 Subject: [PATCH 3/4] chore: bump version for emqx_dashboard --- lib-ce/emqx_dashboard/src/emqx_dashboard.app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src b/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src index a870ede61..53a7e3a77 100644 --- a/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src +++ b/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src @@ -1,6 +1,6 @@ {application, emqx_dashboard, [{description, "EMQX Web Dashboard"}, - {vsn, "4.4.14"}, % strict semver, bump manually! + {vsn, "4.4.15"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_dashboard_sup]}, {applications, [kernel,stdlib,mnesia,minirest]}, From 2c22b7d8e9b1494a0c28fa2f6b6c486f29ee83cd Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Wed, 8 Mar 2023 16:00:05 +0800 Subject: [PATCH 4/4] chore: update the change logs --- changes/v4.4.16-en.md | 10 ++++++++++ changes/v4.4.16-zh.md | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/changes/v4.4.16-en.md b/changes/v4.4.16-en.md index 089ae46b3..cb727c09c 100644 --- a/changes/v4.4.16-en.md +++ b/changes/v4.4.16-en.md @@ -3,3 +3,13 @@ ## Enhancements ## Bug fixes + +- Avoid changing the payload of MQTT messages when printing debug logs [#10091](https://github.com/emqx/emqx/pull/10091). + Before this fix, if EMQX receives a message with Payload "e\ne\nc\nc\n2\n\n\n", the log message will be as follows: + ``` + 2023-03-08T13:28:04.320622+08:00 [debug] mqttx_e34bd582@127.0.0.1:54020 [MQTT] RECV PUBLISH(Q1, R0, D0, Topic=t/1, PacketId=39467, Payload=e, e, c, c, 2, , , ) + ``` + This is the corresponding log message now: + ``` + 2023-03-08T14:26:50.935575+08:00 [debug] mqttx_e34bd582@127.0.0.1:54020 [MQTT] RECV PUBLISH(Q1, R0, D0, Topic=t/1, PacketId=39467, Payload=<<"e\ne\nc\nc\n2\n\n\n">>) + ``` diff --git a/changes/v4.4.16-zh.md b/changes/v4.4.16-zh.md index b111846d9..a9dd5e93b 100644 --- a/changes/v4.4.16-zh.md +++ b/changes/v4.4.16-zh.md @@ -3,3 +3,13 @@ ## 增强 ## 修复 + +- 避免打印 debug 日志的时候改动 MQTT 消息的 Payload 的内容 [#10091](https://github.com/emqx/emqx/pull/10091) + 在这个修复之前，如果 EMQX 收到一个 Payload 为 "e\ne\nc\nc\n2\n\n\n" 的消息，日志打印会变成这样： + ``` + 2023-03-08T13:28:04.320622+08:00 [debug] mqttx_e34bd582@127.0.0.1:54020 [MQTT] RECV PUBLISH(Q1, R0, D0, Topic=t/1, PacketId=39467, Payload=e, e, c, c, 2, , , ) + ``` + 这是此修复之后的样子： + ``` + 2023-03-08T14:26:50.935575+08:00 [debug] mqttx_e34bd582@127.0.0.1:54020 [MQTT] RECV PUBLISH(Q1, R0, D0, Topic=t/1, PacketId=39467, Payload=<<"e\ne\nc\nc\n2\n\n\n">>) + ```