Merge pull request #10183 from terry-xiaoyu/update-esockd-vsn

chore: update esockd to 5.8.9
This commit is contained in:
Xinyu Liu 2023-03-21 13:46:22 +08:00 committed by GitHub
commit 4f3f9d533c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 1 deletions

View File

@ -2,6 +2,25 @@
## Enhancements
- Remove the error logs from the listeners with `Proxy Protocol` enabled when receiving TCP port probes [emqx/esockd#172](https://github.com/emqx/esockd/pull/172).
Before this change, if the listener has enabled the Proxy Protocol (`listener.tcp.external.proxy_protocol=on`),
and if the connection get disconnected right after the TCP handshake is completed and before the ProxyInfo is received, the following error log will be printed:
```
[error] supervisor: 'esockd_connection_sup - <0.3265.0>', errorContext: connection_shutdown, reason: {recv_proxy_info_error,tcp_closed}, offender:
```
After this change, no logs will be printed, but you can still view the statistics of error causes by using the `emqx_ctl listeners` command.
- Improve the logs when the listener experiences file descriptor exhaustion errors [emqx/esockd#173](https://github.com/emqx/esockd/pull/173).
Previous log messages:
```
[error] Accept error on 0.0.0.0:1883: emfile
```
Log messages after this change:
```
[error] Accept error on 0.0.0.0:1883: EMFILE (Too many open files)
```
## Bug fixes
- Fix that `Erlang distribution` can't use TLS [#9981](https://github.com/emqx/emqx/pull/9981).

View File

@ -2,6 +2,24 @@
## 增强
- 启用了 `Proxy Protocol` 的监听器在收到 TCP 端口探测时,不再打印错误日志 [emqx/esockd#172](https://github.com/emqx/esockd/pull/172)。
在此修复之前,如果监听器开启了 Proxy Protocol (`listener.tcp.external.proxy_protocol = on`)
并且在 TCP 握手完成之后、收到 ProxyInfo 之前连接就被断开了,会打印下面一行错误日志:
```
[error] supervisor: 'esockd_connection_sup - <0.3265.0>', errorContext: connection_shutdown, reason: {recv_proxy_info_error,tcp_closed}, offender:
```
次修复之后不再打印任何日志,但仍然可以通过 `emqx_ctl listeners` 命令来查看错误原因的统计。
- 改进监听器出现文件描述符耗尽错误时的日志 [emqx/esockd#173](https://github.com/emqx/esockd/pull/173)。
之前的日志:
```
[error] Accept error on 0.0.0.0:1883: emfile
```
改进之后:
```
[error] Accept error on 0.0.0.0:1883: EMFILE (Too many open files)
```
## 修复
- 修复 `Erlang distribution` 无法使用 TLS 的问题 [#9981](https://github.com/emqx/emqx/pull/9981)。

View File

@ -48,7 +48,7 @@
, {gproc, {git, "https://github.com/uwiger/gproc", {tag, "0.9.0"}}}
, {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}}
, {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.1"}}}
, {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.8"}}}
, {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.9"}}}
, {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.8.1.11"}}}
, {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "3.0.1"}}}
, {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v3.3.6"}}}