Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/processone/ejabberd.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/ejabberd_admin.erl')
-rw-r--r--src/ejabberd_admin.erl25
1 files changed, 3 insertions, 22 deletions
diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl
index 9fa95abf6..5218d588a 100644
--- a/src/ejabberd_admin.erl
+++ b/src/ejabberd_admin.erl
@@ -53,6 +53,7 @@
]).
-include("ejabberd.hrl").
+-include("logger.hrl").
-include("ejabberd_commands.hrl").
start() ->
@@ -96,7 +97,7 @@ commands() ->
result = {res, rescode}},
#ejabberd_commands{name = get_loglevel, tags = [logs, server],
desc = "Get the current loglevel",
- module = ejabberd_loglevel, function = get,
+ module = ejabberd_logger, function = get,
args = [],
result = {leveltuple, {tuple, [{levelnumber, integer},
{levelatom, atom},
@@ -240,27 +241,7 @@ status() ->
reopen_log() ->
ejabberd_hooks:run(reopen_log_hook, []),
- %% TODO: Use the Reopen log API for logger_h ?
- ejabberd_logger_h:reopen_log(),
- case application:get_env(sasl,sasl_error_logger) of
- {ok, {file, SASLfile}} ->
- error_logger:delete_report_handler(sasl_report_file_h),
- ejabberd_logger_h:rotate_log(SASLfile),
- error_logger:add_report_handler(sasl_report_file_h,
- {SASLfile, get_sasl_error_logger_type()});
- _ -> false
- end,
- ok.
-
-%% Function copied from Erlang/OTP lib/sasl/src/sasl.erl which doesn't export it
-get_sasl_error_logger_type () ->
- case application:get_env (sasl, errlog_type) of
- {ok, error} -> error;
- {ok, progress} -> progress;
- {ok, all} -> all;
- {ok, Bad} -> exit ({bad_config, {sasl, {errlog_type, Bad}}});
- _ -> all
- end.
+ ejabberd_logger:reopen_log().
%%%
%%% Stop Kindly