1 files changed, 8 insertions, 8 deletions

diff --git a/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_reader.erl b/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_reader.erl
index 8906677a9f..a004eacd56 100644
--- a/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_reader.erl
+++ b/deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_reader.erl
@@ -208,7 +208,7 @@ switch_callback(State, Callback, Length) ->
 terminate(Reason, State) when ?IS_RUNNING(State) ->
     {normal, handle_exception(State, 0,
                               {?V_1_0_AMQP_ERROR_INTERNAL_ERROR,
-                               "Connection forced: ~p~n", [Reason]})};
+                               "Connection forced: ~p", [Reason]})};
 terminate(_Reason, State) ->
     {force, State}.
 
@@ -251,7 +251,7 @@ handle_dependent_exit(ChPid, Reason, State) ->
         {Channel, uncontrolled} ->
             {RealReason, Trace} = Reason,
             R = {?V_1_0_AMQP_ERROR_INTERNAL_ERROR,
-                 "Session error: ~p~n~p~n", [RealReason, Trace]},
+                 "Session error: ~p~n~p", [RealReason, Trace]},
             maybe_close(handle_exception(control_throttle(State), Channel, R))
     end.
 
@@ -279,13 +279,13 @@ error_frame(Condition, Fmt, Args) ->
 
 handle_exception(State = #v1{connection_state = closed}, Channel,
                  #'v1_0.error'{description = {utf8, Desc}}) ->
-    rabbit_log_connection:error("AMQP 1.0 connection ~p (~p), channel ~p - error:~n~p~n",
+    rabbit_log_connection:error("Error on AMQP 1.0 connection ~p (~p), channel ~p:~n~p",
         [self(), closed, Channel, Desc]),
     State;
 handle_exception(State = #v1{connection_state = CS}, Channel,
                  ErrorFrame = #'v1_0.error'{description = {utf8, Desc}})
   when ?IS_RUNNING(State) orelse CS =:= closing ->
-    rabbit_log_connection:error("AMQP 1.0 connection ~p (~p), channel ~p - error:~n~p~n",
+    rabbit_log_connection:error("Error on AMQP 1.0 connection ~p (~p), channel ~p:~n~p",
         [self(), CS, Channel, Desc]),
     %% TODO: session errors shouldn't force the connection to close
     State1 = close_connection(State),
@@ -321,11 +321,11 @@ handle_1_0_frame(Mode, Channel, Payload, State) ->
             %% section 2.8.15 in http://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-complete-v1.0-os.pdf
             handle_exception(State, 0, error_frame(
                                          ?V_1_0_AMQP_ERROR_UNAUTHORIZED_ACCESS,
-                                         "Access for user '~s' was refused: insufficient permissions~n", [Username]));
+                                         "Access for user '~s' was refused: insufficient permissions", [Username]));
         _:Reason:Trace ->
             handle_exception(State, 0, error_frame(
                                          ?V_1_0_AMQP_ERROR_INTERNAL_ERROR,
-                                         "Reader error: ~p~n~p~n",
+                                         "Reader error: ~p~n~p",
                                          [Reason, Trace]))
     end.
 
@@ -350,12 +350,12 @@ handle_1_0_frame0(Mode, Channel, Payload, State) ->
 parse_1_0_frame(Payload, _Channel) ->
     {PerfDesc, Rest} = amqp10_binary_parser:parse(Payload),
     Perf = amqp10_framing:decode(PerfDesc),
-    ?DEBUG("Channel ~p ->~n~p~n~s~n",
+    ?DEBUG("Channel ~p ->~n~p~n~s",
            [_Channel, amqp10_framing:pprint(Perf),
             case Rest of
                 <<>> -> <<>>;
                 _    -> rabbit_misc:format(
-                          "  followed by ~p bytes of content~n", [size(Rest)])
+                          "  followed by ~p bytes of content", [size(Rest)])
             end]),
     case Rest of
         <<>> -> Perf;