Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Add option to set net_ticktime (EJAB-1742)

This commit is contained in:
Paweł Chmielowski 2015-06-15 14:57:07 +02:00
parent 357ff6c8f7
commit dcf5aefea0
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ejabberd.yml.example
View File

@ -72,6 +72,15 @@ log_rate_limit: 100
## watchdog_admins: ## watchdog_admins:
## - "bob@example.com" ## - "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 ###' SERVED HOSTNAMES

15
src/ejabberd_app.erl
View File

@ -54,7 +54,7 @@ start(normal, _Args) ->
ejabberd_admin:start(), ejabberd_admin:start(),
gen_mod:start(), gen_mod:start(),
ejabberd_config:start(), ejabberd_config:start(),
set_loglevel_from_config(), set_settings_from_config(),
acl:start(), acl:start(),
shaper:start(), shaper:start(),
connect_nodes(), connect_nodes(),
@ -234,12 +234,17 @@ delete_pid_file() ->
file:delete(PidFilename) file:delete(PidFilename)
end. end.
set_loglevel_from_config() -> set_settings_from_config() ->
Level = ejabberd_config:get_option( Level = ejabberd_config:get_option(
loglevel, loglevel,
fun(P) when P>=0, P=<5 -> P end, fun(P) when P>=0, P=<5 -> P end,
4), 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() -> start_apps() ->
crypto:start(), crypto:start(),
@ -252,6 +257,8 @@ start_apps() ->
ejabberd:start_app(p1_zlib), ejabberd:start_app(p1_zlib),
ejabberd:start_app(p1_cache_tab). ejabberd:start_app(p1_cache_tab).
opt_type(net_ticktime) ->
fun (P) when is_integer(P), P > 0 -> P end;
opt_type(cluster_nodes) -> opt_type(cluster_nodes) ->
fun (Ns) -> true = lists:all(fun is_atom/1, Ns), Ns end; fun (Ns) -> true = lists:all(fun is_atom/1, Ns), Ns end;
opt_type(loglevel) -> opt_type(loglevel) ->
@ -263,4 +270,4 @@ opt_type(modules) ->
end, end,
Mods) Mods)
end; end;
opt_type(_) -> [cluster_nodes, loglevel, modules]. opt_type(_) -> [cluster_nodes, loglevel, modules, net_ticktime].