summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-09-24 13:26:11 +0100
committerSimon MacMullen <simon@rabbitmq.com>2014-09-24 13:26:11 +0100
commit81c521431a35c838b0792c4d839182b734291ce6 (patch)
tree075e2116d337f7f17c2183155d6468537cbaa7f8
parent101ec18f46bf70a66348a84410f501e3cca4f2df (diff)
downloadrabbitmq-server-bug26386.tar.gz
Just log a warning if we can't start the logging exchange.bug26386
-rw-r--r--src/rabbit_error_logger.erl16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/rabbit_error_logger.erl b/src/rabbit_error_logger.erl
index 353da0a7..c2fd3c18 100644
--- a/src/rabbit_error_logger.erl
+++ b/src/rabbit_error_logger.erl
@@ -42,11 +42,21 @@
start() ->
{ok, DefaultVHost} = application:get_env(default_vhost),
- ok = error_logger:add_report_handler(?MODULE, [DefaultVHost]).
+ case error_logger:add_report_handler(?MODULE, [DefaultVHost]) of
+ ok ->
+ ok;
+ {error, {no_such_vhost, DefaultVHost}} ->
+ rabbit_log:warning("Default virtual host '~s' not found; "
+ "exchange '~s' disabled~n",
+ [DefaultVHost, ?LOG_EXCH_NAME]),
+ ok
+ end.
stop() ->
- terminated_ok = error_logger:delete_report_handler(rabbit_error_logger),
- ok.
+ case error_logger:delete_report_handler(rabbit_error_logger) of
+ terminated_ok -> ok;
+ {error, module_not_found} -> ok
+ end.
%%----------------------------------------------------------------------------