diff options
| author | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2018-09-07 18:03:36 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2018-09-07 18:03:36 +0300 |
| commit | 145c0116bf2ac2dbbf8647af06c1c179b21386ef (patch) | |
| tree | 907151b19fdc02d9e8ee11228af4e4059a5d44d5 /src | |
| parent | Add information about real sender to mucsub message meta (diff) | |
Bump lager version
This is needed for OTP-21 compatibility
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_logger.erl | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/ejabberd_logger.erl b/src/ejabberd_logger.erl index 2b3eab0eb..aac0baf59 100644 --- a/src/ejabberd_logger.erl +++ b/src/ejabberd_logger.erl @@ -143,10 +143,14 @@ do_start(Level) -> LogRotateSize = get_integer_env(log_rotate_size, 10*1024*1024), LogRotateCount = get_integer_env(log_rotate_count, 1), LogRateLimit = get_integer_env(log_rate_limit, 100), + ConsoleLevel = case get_lager_version() >= "3.6.0" of + true -> [{level, Level}]; + false -> Level + end, application:set_env(lager, error_logger_hwm, LogRateLimit), application:set_env( lager, handlers, - [{lager_console_backend, Level}, + [{lager_console_backend, ConsoleLevel}, {lager_file_backend, [{file, ConsoleLog}, {level, Level}, {date, LogRotateDate}, {count, LogRotateCount}, {size, LogRotateSize}]}, {lager_file_backend, [{file, ErrorLog}, {level, error}, {date, LogRotateDate}, @@ -252,3 +256,10 @@ get_lager_handlers() -> Result -> Result end. + +get_lager_version() -> + Apps = application:loaded_applications(), + case lists:keyfind(lager, 1, Apps) of + {_, _, Vsn} -> Vsn; + false -> "0.0.0" + end. |