Skip to content

Commit

Permalink
Add option to set net_ticktime (EJAB-1742)
Browse files Browse the repository at this point in the history
  • Loading branch information
prefiks committed Jun 15, 2015
1 parent 357ff6c commit dcf5aef
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 4 deletions.
9 changes: 9 additions & 0 deletions ejabberd.yml.example
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,15 @@ log_rate_limit: 100
## watchdog_admins:
## - "bob@example.com"

###. ===============
###' NODE PARAMETERS

##
## net_ticktime: Specifies net_kernel tick time in seconds. This options must have
## identical value on all nodes, and in most cases shouldn't be changed at all from
## default value.
##
## net_ticktime: 60

###. ================
###' SERVED HOSTNAMES
Expand Down
15 changes: 11 additions & 4 deletions src/ejabberd_app.erl
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ start(normal, _Args) ->
ejabberd_admin:start(),
gen_mod:start(),
ejabberd_config:start(),
set_loglevel_from_config(),
set_settings_from_config(),
acl:start(),
shaper:start(),
connect_nodes(),
Expand Down Expand Up @@ -234,12 +234,17 @@ delete_pid_file() ->
file:delete(PidFilename)
end.

set_loglevel_from_config() ->
set_settings_from_config() ->
Level = ejabberd_config:get_option(
loglevel,
fun(P) when P>=0, P=<5 -> P end,
4),
ejabberd_logger:set(Level).
ejabberd_logger:set(Level),
Ticktime = ejabberd_config:get_option(
net_ticktime,
opt_type(net_ticktime),
60),
net_kernel:set_net_ticktime(Ticktime).

start_apps() ->
crypto:start(),
Expand All @@ -252,6 +257,8 @@ start_apps() ->
ejabberd:start_app(p1_zlib),
ejabberd:start_app(p1_cache_tab).

opt_type(net_ticktime) ->
fun (P) when is_integer(P), P > 0 -> P end;
opt_type(cluster_nodes) ->
fun (Ns) -> true = lists:all(fun is_atom/1, Ns), Ns end;
opt_type(loglevel) ->
Expand All @@ -263,4 +270,4 @@ opt_type(modules) ->
end,
Mods)
end;
opt_type(_) -> [cluster_nodes, loglevel, modules].
opt_type(_) -> [cluster_nodes, loglevel, modules, net_ticktime].

0 comments on commit dcf5aef

Please sign in to comment.