From 629e568294c9ba07efeae50eaf22fa8cd96108b0 Mon Sep 17 00:00:00 2001 From: Badlop Date: Wed, 13 Mar 2019 11:07:13 +0100 Subject: [PATCH] Delete the ping timer only when timeout_action=kill (#2820) --- src/mod_ping.erl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mod_ping.erl b/src/mod_ping.erl index 25d2b60ed..fd3a08909 100644 --- a/src/mod_ping.erl +++ b/src/mod_ping.erl @@ -131,10 +131,9 @@ handle_info({iq_reply, #iq{type = error}, JID}, State) -> handle_info({iq_reply, #iq{}, _JID}, State) -> {noreply, State}; handle_info({iq_reply, timeout, JID}, State) -> - Timers = del_timer(JID, State#state.timers), ejabberd_hooks:run(user_ping_timeout, State#state.host, [JID]), - case State#state.timeout_action of + Timers = case State#state.timeout_action of kill -> #jid{user = User, server = Server, resource = Resource} = @@ -143,8 +142,10 @@ handle_info({iq_reply, timeout, JID}, State) -> of Pid when is_pid(Pid) -> ejabberd_c2s:close(Pid, ping_timeout); _ -> ok - end; - _ -> ok + end, + del_timer(JID, State#state.timers); + _ -> + State#state.timers end, {noreply, State#state{timers = Timers}}; handle_info({timeout, _TRef, {ping, JID}}, State) ->