Report failures of changing net_ticktime

diff --git a/src/ejabberd_cluster.erl b/src/ejabberd_cluster.erl
index 9cb18924886d5f2ca1f7cbb69216fe7f06506e7a..81c605cde0f10fe5d49f4cf5226d2c70115dba85 100644 (file)
--- 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