diff options
Diffstat (limited to 'src/ejabberd_options.erl')
| -rw-r--r-- | src/ejabberd_options.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ejabberd_options.erl b/src/ejabberd_options.erl index 16d3f7ba5..505c20fd7 100644 --- a/src/ejabberd_options.erl +++ b/src/ejabberd_options.erl @@ -215,7 +215,7 @@ opt_type(modules) -> opt_type(negotiation_timeout) -> econf:timeout(second); opt_type(net_ticktime) -> - econf:pos_int(); + econf:timeout(second); opt_type(new_sql_schema) -> econf:bool(); opt_type(oauth_access) -> @@ -277,7 +277,7 @@ opt_type(redis_queue_type) -> opt_type(redis_server) -> econf:string(); opt_type(registration_timeout) -> - econf:pos_int(infinity); + econf:timeout(second, infinity); opt_type(resource_conflict) -> econf:enum([setresource, closeold, closenew, acceptnew]); opt_type(riak_cacertfile) -> @@ -319,7 +319,7 @@ opt_type(s2s_dns_retries) -> opt_type(s2s_dns_timeout) -> econf:timeout(second, infinity); opt_type(s2s_max_retry_delay) -> - econf:pos_int(); + econf:timeout(second); opt_type(s2s_protocol_options) -> econf:and_then( econf:list(econf:binary(), [unique]), @@ -536,7 +536,7 @@ options() -> {max_fsm_queue, undefined}, {modules, []}, {negotiation_timeout, timer:seconds(30)}, - {net_ticktime, 60}, + {net_ticktime, timer:seconds(60)}, {new_sql_schema, ?USE_NEW_SQL_SCHEMA_DEFAULT}, {oauth_access, none}, {oauth_cache_life_time, @@ -568,7 +568,7 @@ options() -> {redis_queue_type, fun(Host) -> ejabberd_config:get_option({queue_type, Host}) end}, {redis_server, "localhost"}, - {registration_timeout, 600}, + {registration_timeout, timer:seconds(600)}, {resource_conflict, acceptnew}, {riak_cacertfile, nil}, {riak_password, nil}, @@ -594,7 +594,7 @@ options() -> {s2s_dhfile, undefined}, {s2s_dns_retries, 2}, {s2s_dns_timeout, timer:seconds(10)}, - {s2s_max_retry_delay, 300}, + {s2s_max_retry_delay, timer:seconds(300)}, {s2s_protocol_options, undefined}, {s2s_queue_type, fun(Host) -> ejabberd_config:get_option({queue_type, Host}) end}, |