diff options
| author | Michael Klishin <michael@rabbitmq.com> | 2014-06-18 22:04:08 +0400 |
|---|---|---|
| committer | Michael Klishin <michael@rabbitmq.com> | 2014-06-18 22:04:08 +0400 |
| commit | f3115189bf0bdc74d02ea99d6e2f0d0e68f4e138 (patch) | |
| tree | d95e0f99387cdf20a06fbf4e1ae6fe703c1c0cd2 /src | |
| parent | 1365c57cee0fde3f3414e123f82e64766092e046 (diff) | |
| parent | b4c3797f62ba7db688a2d2a47e8e29c9adf77997 (diff) | |
| download | rabbitmq-server-git-f3115189bf0bdc74d02ea99d6e2f0d0e68f4e138.tar.gz | |
merge default into bug26148
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_channel.erl | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index bb6265544c..fdae2d7985 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -437,13 +437,21 @@ handle_exception(Reason, State = #ch{protocol = Protocol, channel = Channel, writer_pid = WriterPid, reader_pid = ReaderPid, - conn_pid = ConnPid}) -> + conn_name = ConnName, + virtual_host = VHost, + user = #user{ + username = Username + } + }) -> %% something bad's happened: notify_queues may not be 'ok' {_Result, State1} = notify_queues(State), case rabbit_binary_generator:map_exception(Channel, Reason, Protocol) of {Channel, CloseMethod} -> - rabbit_log:error("connection ~p, channel ~p - soft error:~n~p~n", - [ConnPid, Channel, Reason]), + rabbit_log:error("connection ~s, channel ~p - soft error (vhost '~s', user '~s'):~n~p~n", + [ConnName, Channel, + binary_to_list(VHost), + binary_to_list(Username), + Reason]), ok = rabbit_writer:send_command(WriterPid, CloseMethod), {noreply, State1}; {0, _} -> |