aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEvgeny Khramtsov <ekhramtsov@process-one.net>2019-07-18 13:02:13 +0300
committerEvgeny Khramtsov <ekhramtsov@process-one.net>2019-07-18 13:02:13 +0300
commit478f69317bf93f3f97e01ef8a78a13aa1b382d27 (patch)
treef3c2bea05f492a780bf2c4310bbacc6b4396f9a6 /src
parentReset net ticktime on config reload (diff)
Report failures of changing net_ticktime
Diffstat (limited to 'src')
-rw-r--r--src/ejabberd_cluster.erl10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/ejabberd_cluster.erl b/src/ejabberd_cluster.erl
index 9cb189248..81c605cde 100644
--- a/src/ejabberd_cluster.erl
+++ b/src/ejabberd_cluster.erl
@@ -163,7 +163,15 @@ subscribe(Proc) ->
%%%===================================================================
set_ticktime() ->
Ticktime = ejabberd_option:net_ticktime() div 1000,
- net_kernel:set_net_ticktime(Ticktime).
+ case net_kernel:set_net_ticktime(Ticktime) of
+ {ongoing_change_to, Time} when Time /= Ticktime ->
+ ?ERROR_MSG("Failed to set new net_ticktime because "
+ "the net kernel is busy changing it to the "
+ "previously configured value. Please wait for "
+ "~B seconds and retry", [Time]);
+ _ ->
+ ok
+ end.
%%%===================================================================
%%% gen_server API