Merge pull request #795 from emqtt/emq20

ws metrics

src/emqttd_ws.erl

@@ -55,6 +55,7 @@ ws_loop([<<>>], State, _ReplyChannel) ->
 ws_loop(Data, State = #wsocket_state{peer = Peer, client_pid = ClientPid,
                                      parser_fun = ParserFun}, ReplyChannel) ->
     ?WSLOG(debug, Peer, "RECV ~p", [Data]),
+    emqttd_metrics:inc('bytes/received', size(Data)),
     case catch ParserFun(iolist_to_binary(Data)) of
         {more, NewParser} ->
             State#wsocket_state{parser_fun = NewParser};

src/emqttd_ws_client.erl

@@ -107,6 +107,7 @@ handle_cast({unsubscribe, Topics}, State) ->
         end, State);
 
 handle_cast({received, Packet}, State = #wsclient_state{peer = Peer, proto_state = ProtoState}) ->
+    emqttd_metrics:received(Packet),
     case emqttd_protocol:received(Packet, ProtoState) of
         {ok, ProtoState1} ->
             noreply(State#wsclient_state{proto_state = ProtoState1});