Merge branch 'stable'

1 files changed, 9 insertions, 8 deletions

diff --git a/src/rabbit_error_logger.erl b/src/rabbit_error_logger.erl
index 0103d4e503..84d1ae6e93 100644
--- a/src/rabbit_error_logger.erl
+++ b/src/rabbit_error_logger.erl
@@ -68,7 +68,7 @@ init([DefaultVHost]) ->
                    name = ?LOG_EXCH_NAME}}.
 
 terminate(_Arg, _State) ->
-    terminated_ok.
+    ok.
 
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
@@ -104,13 +104,14 @@ publish1(RoutingKey, Format, Data, LogExch) ->
 
     Args = [truncate:term(A, ?LOG_TRUNC) || A <- Data],
     Headers = [{<<"node">>, longstr, list_to_binary(atom_to_list(node()))}],
-    {ok, _DeliveredQPids} =
-        rabbit_basic:publish(LogExch, RoutingKey,
-                             #'P_basic'{content_type = <<"text/plain">>,
-                                        timestamp    = Timestamp,
-                                        headers      = Headers},
-                             list_to_binary(io_lib:format(Format, Args))),
-    ok.
+    case rabbit_basic:publish(LogExch, RoutingKey,
+                              #'P_basic'{content_type = <<"text/plain">>,
+                                         timestamp    = Timestamp,
+                                         headers      = Headers},
+                              list_to_binary(io_lib:format(Format, Args))) of
+        {ok, _DeliveredQPids} -> ok;
+        {error, not_found}    -> ok
+    end.
 
 
 safe_handle_event(HandleEvent, Event, State) ->