From 49ebed5b0b58228d5749168ba927969bcae2ce20 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Wed, 7 Dec 2016 18:37:47 +0800 Subject: [PATCH] iolist_size --- src/emqttd_client.erl | 4 ++-- src/emqttd_ws.erl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/emqttd_client.erl b/src/emqttd_client.erl index 12bd2942a..931343efe 100644 --- a/src/emqttd_client.erl +++ b/src/emqttd_client.erl @@ -92,7 +92,7 @@ init([OriginConn, MqttEnv]) -> SendFun = fun(Packet) -> Data = emqttd_serializer:serialize(Packet), ?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 true -> ok catch @@ -184,7 +184,7 @@ handle_info(activate_sock, State) -> hibernate(run_socket(State#client_state{conn_state = running})); handle_info({inet_async, _Sock, _Ref, {ok, Data}}, State) -> - Size = size(Data), + Size = iolist_size(Data), ?LOG(debug, "RECV ~p", [Data], State), emqttd_metrics:inc('bytes/received', Size), received(Data, rate_limit(Size, State#client_state{await_recv = false})); diff --git a/src/emqttd_ws.erl b/src/emqttd_ws.erl index aba43dfee..cd48a45c1 100644 --- a/src/emqttd_ws.erl +++ b/src/emqttd_ws.erl @@ -55,7 +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)), + emqttd_metrics:inc('bytes/received', iolist_size(Data)), case catch ParserFun(iolist_to_binary(Data)) of {more, NewParser} -> State#wsocket_state{parser_fun = NewParser};