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

WSLOG

This commit is contained in:
Feng 2016-06-30 23:24:02 +08:00
parent 8403dcc051
commit 3a43d2b41f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/emqttd_ws.erl
View File

@ -21,7 +21,7 @@
%% WebSocket Loop State %% WebSocket Loop State
-record(wsocket_state, {peer, client_pid, packet_opts, parser_fun}). -record(wsocket_state, {peer, client_pid, packet_opts, parser_fun}).
-define(LOG(Level, Peer, Format, Args), -define(WSLOG(Level, Peer, Format, Args),
lager:Level("WsClient(~s): " ++ Format, [Peer | Args])). lager:Level("WsClient(~s): " ++ Format, [Peer | Args])).
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
@ -54,7 +54,7 @@ ws_loop([<<>>], State, _ReplyChannel) ->
State; State;
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) ->
?LOG(debug, Peer, "RECV ~p", [Data]), ?WSLOG(debug, Peer, "RECV ~p", [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};
@ -62,11 +62,11 @@ ws_loop(Data, State = #wsocket_state{peer = Peer, client_pid = ClientPid,
gen_server:cast(ClientPid, {received, Packet}), gen_server:cast(ClientPid, {received, Packet}),
ws_loop(Rest, reset_parser(State), ReplyChannel); ws_loop(Rest, reset_parser(State), ReplyChannel);
{error, Error} -> {error, Error} ->
?LOG(error, Peer, "Frame error: ~p", [Error]), ?WSLOG(error, Peer, "Frame error: ~p", [Error]),
exit({shutdown, Error}); exit({shutdown, Error});
{'EXIT', Reason} -> {'EXIT', Reason} ->
?LOG(error, Peer, "Frame error: ~p", [Reason]), ?WSLOG(error, Peer, "Frame error: ~p", [Reason]),
?LOG(error, Peer, "Error data: ~p", [Data]), ?WSLOG(error, Peer, "Error data: ~p", [Data]),
exit({shutdown, parser_error}) exit({shutdown, parser_error})
end. end.