diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_channel.erl | 10 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index db73343432..8955c406ac 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -440,16 +440,16 @@ handle_exception(Reason, State = #ch{protocol = Protocol, conn_pid = ConnPid, conn_name = ConnName, virtual_host = VHost, - user = #user{ - username = Username - } + user = User }) -> %% 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("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), + 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(User#user.username), ConnPid, Channel, Reason]), ok = rabbit_writer:send_command(WriterPid, CloseMethod), {noreply, State1}; diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 89cebca8d5..be554c6464 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -582,15 +582,15 @@ termination_kind(normal) -> controlled; termination_kind(_) -> uncontrolled. log_hard_error(State = #v1{connection_state = CS, - connection = #connection{name = ConnName, - user = #user{ - username = Username - }, - vhost = VHost}}, + connection = #connection{name = ConnName, + user = User, + vhost = VHost}}, Channel, Reason) -> log(error, - "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), + "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(User#user.username), self(), Channel, Reason]). handle_exception(State = #v1{connection_state = closed}, Channel, Reason) -> |