Just log a warning if we can't start the logging exchange.

1 files changed, 13 insertions, 3 deletions

diff --git a/src/rabbit_error_logger.erl b/src/rabbit_error_logger.erl
index 353da0a7e2..c2fd3c187a 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.
 
 %%----------------------------------------------------------------------------