From c590588b16f887bd5e1151626090f28aae55099b Mon Sep 17 00:00:00 2001 From: anlicheng <244108715@qq.com> Date: Thu, 8 Jan 2026 15:23:35 +0800 Subject: [PATCH] remove lager --- src/emqtt.erl | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/emqtt.erl b/src/emqtt.erl index 586c828..181427a 100644 --- a/src/emqtt.erl +++ b/src/emqtt.erl @@ -782,16 +782,16 @@ connected(cast, ?PUBREC_PACKET(PacketId), State = #state{inflight = Inflight}) - Inflight1 = maps:put(PacketId, {pubrel, PacketId, os:timestamp()}, Inflight), State#state{inflight = Inflight1}; {ok, {pubrel, _Ref, _Ts}} -> - lager:notice("[emqtt] Duplicated PUBREC Packet: ~p, client_id: ~p", [PacketId, State#state.clientid]), + logger:notice("[emqtt] Duplicated PUBREC Packet: ~p, client_id: ~p", [PacketId, State#state.clientid]), State; error -> - lager:warning("[emqtt] Unexpected PUBREC Packet: ~p, client_id: ~p", [PacketId, State#state.clientid]), + logger:warning("[emqtt] Unexpected PUBREC Packet: ~p, client_id: ~p", [PacketId, State#state.clientid]), State end, send_puback(?PUBREL_PACKET(PacketId), NState); connected(cast, ?PUBREC_PACKET(PacketId, ReasonCode), State) -> - lager:notice("[emqtt] Duplicated PUBREC Packet: ~p, reason_code: ~p, client_id: ~p", [PacketId, ReasonCode, State#state.clientid]), + logger:notice("[emqtt] Duplicated PUBREC Packet: ~p, reason_code: ~p, client_id: ~p", [PacketId, ReasonCode, State#state.clientid]), keep_state_and_data; %%TODO::... if auto_ack is false, should we take PacketId from the map? @@ -805,7 +805,7 @@ connected(cast, ?PUBREL_PACKET(PacketId), false -> {keep_state, NewState} end; error -> - lager:warning("[emqtt] Unexpected PUBREL: ~p, client_id: ~p", [PacketId, State#state.clientid]), + logger:warning("[emqtt] Unexpected PUBREL: ~p, client_id: ~p", [PacketId, State#state.clientid]), keep_state_and_data end; @@ -904,34 +904,34 @@ handle_event({call, From}, stop, _StateName, _State) -> {stop_and_reply, normal, [{reply, From, ok}]}; handle_event(info, {TcpOrSsL, _Sock, Data}, _StateName, State) when TcpOrSsL =:= tcp; TcpOrSsL =:= ssl -> - %lager:debug("[emqtt] RECV Data: ~p, client_id: ~p", [Data, State#state.clientid]), + %logger:debug("[emqtt] RECV Data: ~p, client_id: ~p", [Data, State#state.clientid]), process_incoming(Data, [], run_sock(State)); handle_event(info, {Error, _Sock, Reason}, _StateName, State) when Error =:= tcp_error; Error =:= ssl_error -> - lager:error("[emqtt] The connection error occured ~p, reason:~p, client_id: ~p", [Error, Reason, State#state.clientid]), + logger:error("[emqtt] The connection error occured ~p, reason:~p, client_id: ~p", [Error, Reason, State#state.clientid]), {stop, {shutdown, Reason}, State}; handle_event(info, {Closed, _Sock}, _StateName, State) when Closed =:= tcp_closed; Closed =:= ssl_closed -> - lager:debug("[emqtt] sokcet closed: ~p, client_id: ~p", [Closed, State#state.clientid]), + logger:debug("[emqtt] sokcet closed: ~p, client_id: ~p", [Closed, State#state.clientid]), {stop, {shutdown, Closed}, State}; handle_event(info, {'EXIT', Owner, Reason}, _, State = #state{owner = Owner}) -> - lager:warning("[emqtt] Got EXIT from owner, Reason: ~p, client_id: ~p", [Reason, State#state.clientid]), + logger:warning("[emqtt] Got EXIT from owner, Reason: ~p, client_id: ~p", [Reason, State#state.clientid]), {stop, {shutdown, Reason}, State}; handle_event(info, {inet_reply, _Sock, ok}, _, _State) -> keep_state_and_data; handle_event(info, {inet_reply, _Sock, {error, Reason}}, _, State) -> - lager:error("[emqtt] Got tcp error: ~p, client_id: ~p", [Reason, State#state.clientid]), + logger:error("[emqtt] Got tcp error: ~p, client_id: ~p", [Reason, State#state.clientid]), {stop, {shutdown, Reason}, State}; handle_event(info, EventContent = {'EXIT', Pid, Reason}, StateName, State) -> - lager:warning("[emqtt] State: ~s, Unexpected Event: (info, ~p), from pid: ~p, client_id: ~p", [StateName, EventContent, Pid, State#state.clientid]), + logger:warning("[emqtt] State: ~s, Unexpected Event: (info, ~p), from pid: ~p, client_id: ~p", [StateName, EventContent, Pid, State#state.clientid]), {stop, {shutdown, Reason}, State}; handle_event(EventType, EventContent, StateName, State) -> - lager:error("[emqtt] State: ~s, Unexpected Event: (~p, ~p), client_id: ~p", [StateName, EventType, EventContent, State#state.clientid]), + logger:error("[emqtt] State: ~s, Unexpected Event: (~p, ~p), client_id: ~p", [StateName, EventType, EventContent, State#state.clientid]), keep_state_and_data. %% Mandatory callback functions @@ -978,7 +978,7 @@ delete_inflight(?PUBACK_PACKET(PacketId, ReasonCode, Properties), properties => Properties}), State#state{inflight = maps:remove(PacketId, Inflight)}; error -> - lager:warning("[emqtt] Unexpected PUBACK: ~p, client_id: ~p", [PacketId, State#state.clientid]), + logger:warning("[emqtt] Unexpected PUBACK: ~p, client_id: ~p", [PacketId, State#state.clientid]), State end; delete_inflight(?PUBCOMP_PACKET(PacketId, ReasonCode, Properties), @@ -990,7 +990,7 @@ delete_inflight(?PUBCOMP_PACKET(PacketId, ReasonCode, Properties), properties => Properties}), State#state{inflight = maps:remove(PacketId, Inflight)}; error -> - lager:warning("[emqtt] Unexpected PUBCOMP Packet: ~p, client_id: ~p", [PacketId, State#state.clientid]), + logger:warning("[emqtt] Unexpected PUBCOMP Packet: ~p, client_id: ~p", [PacketId, State#state.clientid]), State end.