diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_cluster.erl | 10 |
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 |