From 4fc81cef855d09829ba655f343903ad7bc57f264 Mon Sep 17 00:00:00 2001
From: Gilbert <gilbertw@emqx.io>
Date: Thu, 11 Apr 2019 12:20:32 +0800
Subject: [PATCH] Change log level  unexpected info in client (#2422)

Change log level for unexpected info in client and rejust code format in emqx_bridge
---
 src/emqx_bridge.erl | 14 ++++++--------
 src/emqx_client.erl |  5 +++++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/emqx_bridge.erl b/src/emqx_bridge.erl
index 6af56d11b..03e7a478e 100644
--- a/src/emqx_bridge.erl
+++ b/src/emqx_bridge.erl
@@ -323,10 +323,9 @@ connecting(enter, _, #{reconnect_delay_ms := Timeout,
         {ok, ConnRef, Conn} ->
             ?LOG(info, "[Bridge] Bridge ~p connected", [name()]),
             Action = {state_timeout, 0, connected},
-            {keep_state,
-             eval_bridge_handler(State#{ conn_ref => ConnRef
-                                       , connection => Conn}, connected),
-             Action};
+            State0 = State#{conn_ref => ConnRef, connection => Conn},
+            State1 = eval_bridge_handler(State0, connected),
+            {keep_state, State1, Action};
         error ->
             Action = {state_timeout, Timeout, reconnect},
             {keep_state_and_data, Action}
@@ -424,7 +423,7 @@ common(StateName, Type, Content, State) ->
 eval_bridge_handler(State = #{bridge_handler := ?NO_BRIDGE_HANDLER}, _Msg) ->
     State;
 eval_bridge_handler(State = #{bridge_handler := Handler}, Msg) ->
-    _ = Handler(Msg),
+    Handler(Msg),
     State.
 
 ensure_present(Key, Topic, State) ->
@@ -564,9 +563,8 @@ disconnect(#{connection := Conn,
              connect_module := Module
             } = State) when Conn =/= undefined ->
     ok = Module:stop(ConnRef, Conn),
-    eval_bridge_handler(State#{conn_ref => undefined,
-                               connection => undefined},
-                        disconnected);
+    State0 = State#{conn_ref => undefined, connection => undefined},
+    eval_bridge_handler(State0, disconnected);
 disconnect(State) ->
     eval_bridge_handler(State, disconnected).
 
diff --git a/src/emqx_client.erl b/src/emqx_client.erl
index 371b020f1..737c699ac 100644
--- a/src/emqx_client.erl
+++ b/src/emqx_client.erl
@@ -928,6 +928,11 @@ handle_event(info, {inet_reply, _Sock, {error, Reason}}, _, State) ->
     ?LOG(error, "[Client] Got tcp error: ~p", [Reason]),
     {stop, {shutdown, Reason}, State};
 
+handle_event(info, EventContent = {'EXIT', _Pid, normal}, StateName, _State) ->
+    ?LOG(error, "[Client] State: ~s, Unexpected Event: (info, ~p)",
+         [StateName, EventContent]),
+    keep_state_and_data;
+
 handle_event(EventType, EventContent, StateName, _StateData) ->
     ?LOG(error, "[Client] State: ~s, Unexpected Event: (~p, ~p)",
          [StateName, EventType, EventContent]),