don't log content on framing error

plus some minor refactors and cosmetic changes

1 files changed, 6 insertions, 8 deletions

diff --git a/src/rabbit_framing_channel.erl b/src/rabbit_framing_channel.erl
index 889e966315..6f14371f16 100644
--- a/src/rabbit_framing_channel.erl
+++ b/src/rabbit_framing_channel.erl
@@ -73,24 +73,22 @@ read_frame(ChannelPid) ->
     end.
 
 mainloop(ChannelPid) ->
-    Decoded = read_frame(ChannelPid),
-    case Decoded of
+    case read_frame(ChannelPid) of
         {method, MethodName, FieldsBin} ->
             Method = rabbit_framing:decode_method_fields(MethodName, FieldsBin),
             case rabbit_framing:method_has_content(MethodName) of
-                true  -> {ClassId, _MethodId} = 
+                true  -> {ClassId, _MethodId} =
                              rabbit_framing:method_id(MethodName),
-                         rabbit_channel:do(ChannelPid, Method,
-                                           collect_content(ChannelPid, 
-                                                           ClassId));
+                         Content = collect_content(ChannelPid, ClassId),
+                         rabbit_channel:do(ChannelPid, Method, Content);
                 false -> rabbit_channel:do(ChannelPid, Method)
             end,
             ?MODULE:mainloop(ChannelPid);
         _ ->
             rabbit_misc:protocol_error(
               unexpected_frame,
-              "expected method frame, got ~p instead",
-              [Decoded])
+              "expected method frame, got non method frame instead",
+              [])
     end.
 
 collect_content(ChannelPid, ClassId) ->