From a884d215e17a594d8d79a98014ad8d915aa03f64 Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Mon, 5 Jul 2021 13:50:37 +0800
Subject: [PATCH] fix(connection): start connection failed

---
 apps/emqx/rebar.config            | 2 +-
 apps/emqx/src/emqx_connection.erl | 3 ++-
 apps/emqx/src/emqx_listeners.erl  | 2 +-
 rebar.config                      | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config
index 22f31a345..7493e79ed 100644
--- a/apps/emqx/rebar.config
+++ b/apps/emqx/rebar.config
@@ -12,7 +12,7 @@
     [ {gproc, {git, "https://github.com/uwiger/gproc", {tag, "0.8.0"}}}
     , {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}}
     , {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.8.2"}}}
-    , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.0"}}}
+    , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.1"}}}
     , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.10.2"}}}
     , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.5.1"}}}
     , {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v4.0.1"}}} %% todo delete when plugins use hocon
diff --git a/apps/emqx/src/emqx_connection.erl b/apps/emqx/src/emqx_connection.erl
index ab91c02b4..54d3a4691 100644
--- a/apps/emqx/src/emqx_connection.erl
+++ b/apps/emqx/src/emqx_connection.erl
@@ -106,6 +106,7 @@
         }).
 
 -type(state() :: #state{}).
+-type(opts() :: #{zone := atom(), listener := atom(), atom() => term()}).
 
 -define(ACTIVE_N, 100).
 -define(INFO_KEYS, [socktype, peername, sockname, sockstate, active_n]).
@@ -134,7 +135,7 @@
                             , system_code_change/4
                             ]}).
 
--spec(start_link(esockd:transport(), esockd:socket(), proplists:proplist())
+-spec(start_link(esockd:transport(), esockd:socket(), opts())
       -> {ok, pid()}).
 start_link(Transport, Socket, Options) ->
     Args = [self(), Transport, Socket, Options],
diff --git a/apps/emqx/src/emqx_listeners.erl b/apps/emqx/src/emqx_listeners.erl
index d8407ec9e..f3af077e2 100644
--- a/apps/emqx/src/emqx_listeners.erl
+++ b/apps/emqx/src/emqx_listeners.erl
@@ -72,7 +72,7 @@ console_print(_Fmt, _Args) -> ok.
       -> {ok, pid()} | {error, term()}).
 do_start_listener(ZoneName, ListenerName, #{type := tcp, bind := ListenOn} = Opts) ->
     esockd:open(listener_id(ZoneName, ListenerName), ListenOn, merge_default(esockd_opts(Opts)),
-                {emqx_connection, start_link, [ZoneName, ListenerName]});
+                {emqx_connection, start_link, [{ZoneName, ListenerName}]});
 
 %% Start MQTT/WS listener
 do_start_listener(ZoneName, ListenerName, #{type := ws, bind := ListenOn} = Opts) ->
diff --git a/rebar.config b/rebar.config
index 66d24fe91..36290848a 100644
--- a/rebar.config
+++ b/rebar.config
@@ -39,7 +39,7 @@
     , {gproc, {git, "https://github.com/uwiger/gproc", {tag, "0.8.0"}}}
     , {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}}
     , {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.8.2"}}}
-    , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.0"}}}
+    , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.1"}}}
     , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.10.2"}}}
     , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.5.1"}}}
     , {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v4.0.1"}}} % TODO: delete when all apps moved to hocon