diff options
| author | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-10-25 15:27:47 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-10-25 15:27:47 +0300 |
| commit | f1a35cc9accce683174accbeba11512e3584ad3e (patch) | |
| tree | 81f2d7292dac61ea46a907f044d9ba7117807b70 /src | |
| parent | TravisCI: test against Erlang/OTP 19.3 (diff) | |
Avoid calling to logger module on OTP<22
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_ctl.erl | 10 | ||||
| -rw-r--r-- | src/ejabberd_logger.erl | 2 | ||||
| -rw-r--r-- | src/ejabberd_option.erl | 2 | ||||
| -rw-r--r-- | src/ejabberd_options.erl | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/src/ejabberd_ctl.erl b/src/ejabberd_ctl.erl index 76a028389..dfc5ca9e7 100644 --- a/src/ejabberd_ctl.erl +++ b/src/ejabberd_ctl.erl @@ -68,7 +68,7 @@ %%----------------------------- start() -> - logger:set_primary_config(level, none), + disable_logging(), [SNode, Timeout, Args] = case init:get_plain_arguments() of [SNode2, "--no-timeout" | Args2] -> [SNode2, infinity, Args2]; @@ -865,6 +865,14 @@ format_usage_tuple([ElementDef | ElementsDef], Indentation) -> print(Format, Args) -> io:format(lists:flatten(Format), Args). +-ifdef(LAGER). +disable_logging() -> + ok. +-else. +disable_logging() -> + logger:set_primary_config(level, none). +-endif. + %%----------------------------- %% Command management %%----------------------------- diff --git a/src/ejabberd_logger.erl b/src/ejabberd_logger.erl index 211099720..2a8c1a199 100644 --- a/src/ejabberd_logger.erl +++ b/src/ejabberd_logger.erl @@ -45,6 +45,8 @@ or (L == critical) or (L == error) or (L == warning) or (L == notice) or (L == info) or (L == debug))). +-export_type([loglevel/0]). + -spec restart() -> ok. -spec reopen_log() -> ok. -spec rotate_log() -> ok. diff --git a/src/ejabberd_option.erl b/src/ejabberd_option.erl index d9721ab1f..fde41e78d 100644 --- a/src/ejabberd_option.erl +++ b/src/ejabberd_option.erl @@ -562,7 +562,7 @@ log_rotate_count() -> log_rotate_size() -> ejabberd_config:get_option({log_rotate_size, global}). --spec loglevel() -> 'none' | logger:level(). +-spec loglevel() -> ejabberd_logger:loglevel(). loglevel() -> ejabberd_config:get_option({loglevel, global}). diff --git a/src/ejabberd_options.erl b/src/ejabberd_options.erl index e95ac878d..eacde998d 100644 --- a/src/ejabberd_options.erl +++ b/src/ejabberd_options.erl @@ -425,7 +425,7 @@ opt_type(jwt_auth_only_rule) -> {websocket_origin, [binary()]} | {disable_sasl_mechanisms, [binary()]} | {s2s_zlib, boolean()} | - {loglevel, none | logger:level()} | + {loglevel, ejabberd_logger:loglevel()} | {listen, [ejabberd_listener:listener()]} | {modules, [{module(), gen_mod:opts(), integer()}]} | {ldap_uids, [{binary(), binary()}]} | |