aboutsummaryrefslogtreecommitdiff
path: root/src/mod_stream_mgmt.erl
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2018-07-17 20:50:58 +0200
committerHolger Weiss <holger@zedat.fu-berlin.de>2018-07-17 20:50:58 +0200
commit68c9328a9c9c74df79e66d008a1d25ff64cfd33f (patch)
treead78006dfd881ff0b09a54a5132239c0fce01e66 /src/mod_stream_mgmt.erl
parentmod_http_upload: Add "Allow" to OPTIONS response (diff)
Move cancel_timer/1 function into 'misc' module
Diffstat (limited to 'src/mod_stream_mgmt.erl')
-rw-r--r--src/mod_stream_mgmt.erl15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/mod_stream_mgmt.erl b/src/mod_stream_mgmt.erl
index a37b6538c..f897a2794 100644
--- a/src/mod_stream_mgmt.erl
+++ b/src/mod_stream_mgmt.erl
@@ -717,7 +717,7 @@ send(#{mod := Mod} = State, Pkt) ->
-spec restart_pending_timer(state(), non_neg_integer()) -> state().
restart_pending_timer(#{mgmt_pending_timer := TRef} = State, NewTimeout) ->
- cancel_timer(TRef),
+ misc:cancel_timer(TRef),
NewTRef = erlang:start_timer(timer:seconds(NewTimeout), self(),
pending_timeout),
State#{mgmt_pending_timer => NewTRef};
@@ -726,22 +726,11 @@ restart_pending_timer(State, _NewTimeout) ->
-spec cancel_ack_timer(state()) -> state().
cancel_ack_timer(#{mgmt_ack_timer := TRef} = State) ->
- cancel_timer(TRef),
+ misc:cancel_timer(TRef),
maps:remove(mgmt_ack_timer, State);
cancel_ack_timer(State) ->
State.
--spec cancel_timer(reference()) -> ok.
-cancel_timer(TRef) ->
- case erlang:cancel_timer(TRef) of
- false ->
- receive {timeout, TRef, _} -> ok
- after 0 -> ok
- end;
- _ ->
- ok
- end.
-
-spec bounce_message_queue() -> ok.
bounce_message_queue() ->
receive {route, Pkt} ->