From ad26eff4215e9ab9ce66fa34a59c0c2a8fe9b552 Mon Sep 17 00:00:00 2001
From: turtled <turtled@emqtt.io>
Date: Wed, 3 Jan 2018 10:27:51 +0800
Subject: [PATCH 1/2] Format print log

---
 src/emqttd_ws.erl | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/emqttd_ws.erl b/src/emqttd_ws.erl
index 35a7f9852..798c4d69b 100644
--- a/src/emqttd_ws.erl
+++ b/src/emqttd_ws.erl
@@ -45,14 +45,22 @@ handle_request('GET', "/mqtt", Req) ->
     Proto   = check_protocol_header(Req),
     case {is_websocket(Upgrade), Proto} of
         {true, "mqtt" ++ _Vsn} ->
-            {ok, ProtoEnv} = emqttd:env(protocol),
-            PacketSize = get_value(max_packet_size, ProtoEnv, ?MAX_PACKET_SIZE),
-            Parser = emqttd_parser:initial_state(PacketSize),
-            %% Upgrade WebSocket.
-            {ReentryWs, ReplyChannel} = mochiweb_websocket:upgrade_connection(Req, fun ?MODULE:ws_loop/3),
-            {ok, ClientPid} = emqttd_ws_client_sup:start_client(self(), Req, ReplyChannel),
-            ReentryWs(#wsocket_state{peername = Req:get(peername), parser = Parser,
-                                     max_packet_size = PacketSize, client_pid = ClientPid});
+            case Req:get(peername) of
+                {ok, Peername} ->
+                    {ok, ProtoEnv} = emqttd:env(protocol),
+                    PacketSize = get_value(max_packet_size, ProtoEnv, ?MAX_PACKET_SIZE),
+                    Parser = emqttd_parser:initial_state(PacketSize),
+                    %% Upgrade WebSocket.
+                    {ReentryWs, ReplyChannel} = mochiweb_websocket:upgrade_connection(Req, fun ?MODULE:ws_loop/3),
+                    {ok, ClientPid} = emqttd_ws_client_sup:start_client(self(), Req, ReplyChannel),
+                    ReentryWs(#wsocket_state{peername = Peername,
+                                             parser = Parser,
+                                             max_packet_size = PacketSize,
+                                             client_pid = ClientPid});
+                {error, Reason} ->
+                    lager:error("Get peername with error ~s", [Reason]),
+                    Req:respond({400, [], <<"Bad Request">>})
+            end;
         {false, _} ->
             lager:error("Not WebSocket: Upgrade = ~s", [Upgrade]),
             Req:respond({400, [], <<"Bad Request">>});

From 0a7e93ea9076719c112990a14b3871935060f8fb Mon Sep 17 00:00:00 2001
From: turtled <turtled@emqtt.io>
Date: Wed, 3 Jan 2018 10:29:51 +0800
Subject: [PATCH 2/2] Export funtion fix #1428

---
 src/emqttd_mgmt.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/emqttd_mgmt.erl b/src/emqttd_mgmt.erl
index 01dd50b1e..1a608968e 100644
--- a/src/emqttd_mgmt.erl
+++ b/src/emqttd_mgmt.erl
@@ -45,7 +45,7 @@
 
 -export([publish/1, subscribe/1, unsubscribe/1]).
 
--export([kick_client/1, clean_acl_cache/2]).
+-export([kick_client/1, kick_client/2, clean_acl_cache/2, clean_acl_cache/3]).
 
 -export([modify_config/2, modify_config/3, modify_config/4, get_configs/0, get_config/1,
          get_plugin_config/1, get_plugin_config/2, modify_plugin_config/2, modify_plugin_config/3]).