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

lager:info -> lager:debug

This commit is contained in:
Ery Lee 2015-03-12 21:35:35 +08:00
parent 77a0e9a85b
commit 557c341106
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/emqttd/src/emqttd_client.erl
View File

@ -132,17 +132,17 @@ handle_info({inet_reply, _Sock, {error, Reason}}, State = #state{peer_name = Pee
{noreply, State}; {noreply, State};
handle_info({keepalive, start, TimeoutSec}, State = #state{transport = Transport, socket = Socket}) -> handle_info({keepalive, start, TimeoutSec}, State = #state{transport = Transport, socket = Socket}) ->
lager:info("Client ~s: Start KeepAlive with ~p seconds", [State#state.peer_name, TimeoutSec]), lager:debug("Client ~s: Start KeepAlive with ~p seconds", [State#state.peer_name, TimeoutSec]),
KeepAlive = emqttd_keepalive:new({Transport, Socket}, TimeoutSec, {keepalive, timeout}), KeepAlive = emqttd_keepalive:new({Transport, Socket}, TimeoutSec, {keepalive, timeout}),
{noreply, State#state{ keepalive = KeepAlive }}; {noreply, State#state{ keepalive = KeepAlive }};
handle_info({keepalive, timeout}, State = #state{keepalive = KeepAlive}) -> handle_info({keepalive, timeout}, State = #state{keepalive = KeepAlive}) ->
case emqttd_keepalive:resume(KeepAlive) of case emqttd_keepalive:resume(KeepAlive) of
timeout -> timeout ->
lager:info("Client ~s: Keepalive Timeout!", [State#state.peer_name]), lager:debug("Client ~s: Keepalive Timeout!", [State#state.peer_name]),
stop({shutdown, keepalive_timeout}, State#state{keepalive = undefined}); stop({shutdown, keepalive_timeout}, State#state{keepalive = undefined});
{resumed, KeepAlive1} -> {resumed, KeepAlive1} ->
lager:info("Client ~s: Keepalive Resumed", [State#state.peer_name]), lager:debug("Client ~s: Keepalive Resumed", [State#state.peer_name]),
{noreply, State#state{keepalive = KeepAlive1}} {noreply, State#state{keepalive = KeepAlive1}}
end; end;
@ -151,7 +151,7 @@ handle_info(Info, State = #state{peer_name = PeerName}) ->
{stop, {badinfo, Info}, State}. {stop, {badinfo, Info}, State}.
terminate(Reason, #state{peer_name = PeerName, keepalive = KeepAlive, proto_state = ProtoState}) -> terminate(Reason, #state{peer_name = PeerName, keepalive = KeepAlive, proto_state = ProtoState}) ->
lager:info("Client ~s: ~p terminated, reason: ~p~n", [PeerName, self(), Reason]), lager:debug("Client ~s: ~p terminated, reason: ~p~n", [PeerName, self(), Reason]),
notify(disconnected, Reason, ProtoState), notify(disconnected, Reason, ProtoState),
emqttd_keepalive:cancel(KeepAlive), emqttd_keepalive:cancel(KeepAlive),
case {ProtoState, Reason} of case {ProtoState, Reason} of

8
apps/emqttd/src/emqttd_protocol.erl
View File

@ -92,7 +92,7 @@ received(_Packet, State = #proto_state{connected = false}) ->
received(Packet = ?PACKET(_Type), State = #proto_state{peer_name = PeerName, received(Packet = ?PACKET(_Type), State = #proto_state{peer_name = PeerName,
client_id = ClientId}) -> client_id = ClientId}) ->
lager:info("RECV from ~s@~s: ~s", [ClientId, PeerName, emqttd_packet:dump(Packet)]), lager:debug("RECV from ~s@~s: ~s", [ClientId, PeerName, emqttd_packet:dump(Packet)]),
case validate_packet(Packet) of case validate_packet(Packet) of
ok -> ok ->
handle(Packet, State); handle(Packet, State);
@ -109,7 +109,7 @@ handle(Packet = ?CONNECT_PACKET(Var), State = #proto_state{peer_name = PeerName}
keep_alive = KeepAlive, keep_alive = KeepAlive,
client_id = ClientId} = Var, client_id = ClientId} = Var,
lager:info("RECV from ~s@~s: ~s", [ClientId, PeerName, emqttd_packet:dump(Packet)]), lager:debug("RECV from ~s@~s: ~s", [ClientId, PeerName, emqttd_packet:dump(Packet)]),
{ReturnCode1, State1} = {ReturnCode1, State1} =
case validate_connect(Var, State) of case validate_connect(Var, State) of
@ -198,7 +198,7 @@ send({_From, Message = #mqtt_message{qos = Qos}}, State = #proto_state{session =
send(emqttd_message:to_packet(Message1), State#proto_state{session = NewSession}); send(emqttd_message:to_packet(Message1), State#proto_state{session = NewSession});
send(Packet, State = #proto_state{transport = Transport, socket = Sock, peer_name = PeerName, client_id = ClientId}) when is_record(Packet, mqtt_packet) -> send(Packet, State = #proto_state{transport = Transport, socket = Sock, peer_name = PeerName, client_id = ClientId}) when is_record(Packet, mqtt_packet) ->
lager:info("SENT to ~s@~s: ~s", [ClientId, PeerName, emqttd_packet:dump(Packet)]), lager:debug("SENT to ~s@~s: ~s", [ClientId, PeerName, emqttd_packet:dump(Packet)]),
sent_stats(Packet), sent_stats(Packet),
Data = emqttd_serialiser:serialise(Packet), Data = emqttd_serialiser:serialise(Packet),
lager:debug("SENT to ~s: ~p", [PeerName, Data]), lager:debug("SENT to ~s: ~p", [PeerName, Data]),
@ -215,7 +215,7 @@ redeliver({?PUBREL, PacketId}, State) ->
shutdown(Error, #proto_state{peer_name = PeerName, client_id = ClientId, will_msg = WillMsg}) -> shutdown(Error, #proto_state{peer_name = PeerName, client_id = ClientId, will_msg = WillMsg}) ->
send_willmsg(WillMsg), send_willmsg(WillMsg),
try_unregister(ClientId, self()), try_unregister(ClientId, self()),
lager:info("Protocol ~s@~s Shutdown: ~p", [ClientId, PeerName, Error]), lager:debug("Protocol ~s@~s Shutdown: ~p", [ClientId, PeerName, Error]),
ok. ok.
willmsg(Packet) when is_record(Packet, mqtt_packet_connect) -> willmsg(Packet) when is_record(Packet, mqtt_packet_connect) ->

2
apps/emqttd/src/emqttd_router.erl
View File

@ -63,7 +63,7 @@ start_link() ->
%%------------------------------------------------------------------------------ %%------------------------------------------------------------------------------
-spec route(mqtt_message()) -> ok. -spec route(mqtt_message()) -> ok.
route(Msg) -> route(Msg) ->
lager:info("Route ~s", [emqttd_message:dump(Msg)]), lager:debug("Route ~s", [emqttd_message:dump(Msg)]),
% TODO: need to retain? % TODO: need to retain?
emqttd_server:retain(Msg), emqttd_server:retain(Msg),
% unset flag and pubsub % unset flag and pubsub