From abbee4bc47ed16dadaeadb8e419fca552d1a6730 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Sun, 17 Sep 2023 19:17:03 +0200 Subject: [PATCH] fix(esockd): upgrade esockd from 5.9.6 to 5.9.7 --- apps/emqx/rebar.config | 2 +- changes/ce/fix-11623.en.md | 8 ++++++++ mix.exs | 2 +- rebar.config | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 changes/ce/fix-11623.en.md diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config index b64c2181e..d1419703c 100644 --- a/apps/emqx/rebar.config +++ b/apps/emqx/rebar.config @@ -27,7 +27,7 @@ {lc, {git, "https://github.com/emqx/lc.git", {tag, "0.3.2"}}}, {gproc, {git, "https://github.com/emqx/gproc", {tag, "0.9.0.1"}}}, {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.2"}}}, - {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.6"}}}, + {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.7"}}}, {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.15.13"}}}, {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}}, {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.39.16"}}}, diff --git a/changes/ce/fix-11623.en.md b/changes/ce/fix-11623.en.md new file mode 100644 index 000000000..318e7f799 --- /dev/null +++ b/changes/ce/fix-11623.en.md @@ -0,0 +1,8 @@ +Upgrade library `esockd` from 5.9.6 to 5.9.7 + +This upgrade included +* Enhancements regarding proxy protocol error and timeout. [esockd pr#178](https://github.com/emqx/esockd/pull/178) +* Lowered `ssl_error` exceptions to info level logging. [esockd pr#180](https://github.com/emqx/esockd/pull/180) +* Malformed MQTT packet parsing exception log level is lowered from `error` to `info`. +* In command `emqx ctl listeners` output, the `shutdown_count` counter is incremented + when TLS handshake failure (`ssl_error`) or Malformed packet (`frame_error`) happens. diff --git a/mix.exs b/mix.exs index 749258f3e..0c3cf16c6 100644 --- a/mix.exs +++ b/mix.exs @@ -53,7 +53,7 @@ defmodule EMQXUmbrella.MixProject do {:gproc, github: "emqx/gproc", tag: "0.9.0.1", override: true}, {:jiffy, github: "emqx/jiffy", tag: "1.0.5", override: true}, {:cowboy, github: "emqx/cowboy", tag: "2.9.2", override: true}, - {:esockd, github: "emqx/esockd", tag: "5.9.6", override: true}, + {:esockd, github: "emqx/esockd", tag: "5.9.7", override: true}, {:rocksdb, github: "emqx/erlang-rocksdb", tag: "1.8.0-emqx-1", override: true}, {:ekka, github: "emqx/ekka", tag: "0.15.13", override: true}, {:gen_rpc, github: "emqx/gen_rpc", tag: "2.8.1", override: true}, diff --git a/rebar.config b/rebar.config index 7a27a59a1..d39b1df96 100644 --- a/rebar.config +++ b/rebar.config @@ -60,7 +60,7 @@ , {gproc, {git, "https://github.com/emqx/gproc", {tag, "0.9.0.1"}}} , {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}} , {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.2"}}} - , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.6"}}} + , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.7"}}} , {rocksdb, {git, "https://github.com/emqx/erlang-rocksdb", {tag, "1.8.0-emqx-1"}}} , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.15.13"}}} , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}}