include method name in error if possible

1 files changed, 20 insertions, 18 deletions

diff --git a/src/rabbit_framing_channel.erl b/src/rabbit_framing_channel.erl
index 5ef54268ec..553faaa814 100644
--- a/src/rabbit_framing_channel.erl
+++ b/src/rabbit_framing_channel.erl
@@ -85,16 +85,16 @@ mainloop(Parent, ChannelPid, Protocol) ->
                                  rabbit_channel:do(ChannelPid, Method, Content),
                                  ?MODULE:mainloop(Parent, ChannelPid, Protocol);
                              {error, Reason} ->
-                                 channel_exit(Parent, Reason)
+                                 channel_exit(Parent, Reason, MethodName)
                          end;
                 false -> rabbit_channel:do(ChannelPid, Method),
                          ?MODULE:mainloop(Parent, ChannelPid, Protocol)
             end;
         _ ->
-            channel_exit(Parent, unexpected_frame(
-                                   "expected method frame, "
-                                   "got non method frame instead",
-                                   []))
+            channel_exit(Parent, {unexpected_frame,
+                                  "expected method frame, "
+                                  "got non method frame instead",
+                                  []}, none)
     end.
 
 collect_content(ChannelPid, ClassId, Protocol) ->
@@ -110,13 +110,15 @@ collect_content(ChannelPid, ClassId, Protocol) ->
                 Error         -> Error
             end;
         {content_header, HeaderClassId, 0, _BodySize, _PropertiesBin} ->
-            {error, unexpected_frame("expected content header for class ~w, "
-                                     "got one for class ~w instead",
-                                     [ClassId, HeaderClassId])};
+            {error, {unexpected_frame,
+                     "expected content header for class ~w, "
+                     "got one for class ~w instead",
+                     [ClassId, HeaderClassId]}};
         _ ->
-            {error, unexpected_frame("expected content header for class ~w, "
-                                     "got non content header frame instead",
-                                     [ClassId])}
+            {error, {unexpected_frame,
+                     "expected content header for class ~w, "
+                     "got non content header frame instead",
+                     [ClassId]}}
     end.
 
 collect_content_payload(_ChannelPid, 0, Acc) ->
@@ -128,13 +130,13 @@ collect_content_payload(ChannelPid, RemainingByteCount, Acc) ->
                                     RemainingByteCount - size(FragmentBin),
                                     [FragmentBin | Acc]);
         _ ->
-            {error, unexpected_frame("expected content body, "
-                                     "got non content body frame instead",
-                                     [])}
+            {error, {unexpected_frame,
+                     "expected content body, "
+                     "got non content body frame instead",
+                     []}}
     end.
 
-unexpected_frame(ExplanationFormat, Params) ->
-    rabbit_misc:amqp_error(unexpected_frame, ExplanationFormat, Params, none).
-
-channel_exit(Parent, Reason) ->
+channel_exit(Parent, {ErrorName, ExplanationFormat, Params}, MethodName) ->
+    Reason = rabbit_misc:amqp_error(ErrorName, ExplanationFormat, Params,
+                                    MethodName),
     Parent ! {channel_exit, self(), Reason}.