diff options
| author | Michael Klishin <michael@rabbitmq.com> | 2014-06-19 06:57:50 +0400 |
|---|---|---|
| committer | Michael Klishin <michael@rabbitmq.com> | 2014-06-19 06:57:50 +0400 |
| commit | 99ea86634445a944686323a24f86e47ed761a6f9 (patch) | |
| tree | 07d4f9722a8a32af12be77a37302d9dfa6b7cfe0 | |
| parent | c065a1ec147c326c64548229bc9b0deecf6f4192 (diff) | |
| download | rabbitmq-server-git-99ea86634445a944686323a24f86e47ed761a6f9.tar.gz | |
Move user and vhost closer to connection info
| -rw-r--r-- | src/rabbit_channel.erl | 8 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 6937cbe355..db73343432 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -448,11 +448,9 @@ handle_exception(Reason, State = #ch{protocol = Protocol, {_Result, State1} = notify_queues(State), case rabbit_binary_generator:map_exception(Channel, Reason, Protocol) of {Channel, CloseMethod} -> - rabbit_log:error("Channel error on connection ~s (~p), channel ~p (vhost '~s', user '~s'):~n~p~n", - [ConnName, ConnPid, Channel, - binary_to_list(VHost), - binary_to_list(Username), - Reason]), + rabbit_log:error("Channel error on connection ~s (vhost '~s', user '~s', pid: ~p), channel ~p:~n~p~n", + [ConnName, binary_to_list(VHost), binary_to_list(Username), + ConnPid, Channel, Reason]), ok = rabbit_writer:send_command(WriterPid, CloseMethod), {noreply, State1}; {0, _} -> diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 56ad549915..89cebca8d5 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -589,9 +589,9 @@ log_hard_error(State = #v1{connection_state = CS, vhost = VHost}}, Channel, Reason) -> log(error, - "Connection error on connection ~s (~p, ~p), channel ~p (vhost '~s', user '~s'):~n~p~n", - [ConnName, self(), CS, Channel, - binary_to_list(VHost), binary_to_list(Username), Reason]). + "Connection error on connection ~s (state: ~p, vhost: '~s', user: '~s', pid: ~p), channel ~p:~n~p~n", + [ConnName, CS, binary_to_list(VHost), binary_to_list(Username), + self(), Channel, Reason]). handle_exception(State = #v1{connection_state = closed}, Channel, Reason) -> log_hard_error(State, Channel, Reason), |