yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iolist_size

This commit is contained in:
Feng Lee 2016-12-07 18:37:47 +08:00
parent 0f55fafcb3
commit 49ebed5b0b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emqttd_client.erl
View File

@ -92,7 +92,7 @@ init([OriginConn, MqttEnv]) ->
SendFun = fun(Packet) -> SendFun = fun(Packet) ->
Data = emqttd_serializer:serialize(Packet), Data = emqttd_serializer:serialize(Packet),
?LOG(debug, "SEND ~p", [Data], #client_state{connname = ConnName}), ?LOG(debug, "SEND ~p", [Data], #client_state{connname = ConnName}),
emqttd_metrics:inc('bytes/sent', size(Data)), emqttd_metrics:inc('bytes/sent', iolist_size(Data)),
try Connection:async_send(Data) of try Connection:async_send(Data) of
true -> ok true -> ok
catch catch
@ -184,7 +184,7 @@ handle_info(activate_sock, State) ->
hibernate(run_socket(State#client_state{conn_state = running})); hibernate(run_socket(State#client_state{conn_state = running}));
handle_info({inet_async, _Sock, _Ref, {ok, Data}}, State) -> handle_info({inet_async, _Sock, _Ref, {ok, Data}}, State) ->
Size = size(Data), Size = iolist_size(Data),
?LOG(debug, "RECV ~p", [Data], State), ?LOG(debug, "RECV ~p", [Data], State),
emqttd_metrics:inc('bytes/received', Size), emqttd_metrics:inc('bytes/received', Size),
received(Data, rate_limit(Size, State#client_state{await_recv = false})); received(Data, rate_limit(Size, State#client_state{await_recv = false}));

2
src/emqttd_ws.erl
View File

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