diff options
| author | Michael Klishin <michael@rabbitmq.com> | 2014-06-22 14:45:45 +0400 |
|---|---|---|
| committer | Michael Klishin <michael@rabbitmq.com> | 2014-06-22 14:45:45 +0400 |
| commit | de73452639b2fab6bc21cd26a54214342b62ba60 (patch) | |
| tree | d6f5faab2b9d3e933047bafcf3a31e7baac880c4 /src | |
| parent | a5a5239d2f8437c54b4a3c3435ea950f3b800902 (diff) | |
| download | rabbitmq-server-git-de73452639b2fab6bc21cd26a54214342b62ba60.tar.gz | |
Formatting
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_reader.erl | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 1d96a042bb..a738888ad1 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -558,19 +558,20 @@ wait_for_channel_termination(N, TimerRef, {'DOWN', _MRef, process, ChPid, Reason} -> {Channel, State1} = channel_cleanup(ChPid, State), case {Channel, termination_kind(Reason)} of - {undefined, _} -> exit({abnormal_dependent_exit, - ChPid, Reason}); - {_, controlled} -> wait_for_channel_termination( - N-1, TimerRef, State1); - {_, uncontrolled} -> log(error, - "Error on AMQP connection ~p (~s, vhost: '~s'," - " user: '~s', state: ~p), channel ~p:" - "error while terminating:~n~p~n", - [self(), ConnName, - VHost, User#user.username, - CS, Channel, Reason]), - wait_for_channel_termination( - N-1, TimerRef, State1) + {undefined, _} -> + exit({abnormal_dependent_exit, + ChPid, Reason}); + {_, controlled} -> + wait_for_channel_termination( + N-1, TimerRef, State1); + {_, uncontrolled} -> + log(error, "Error on AMQP connection ~p (~s, vhost: '~s'," + " user: '~s', state: ~p), channel ~p:" + "error while terminating:~n~p~n", + [self(), ConnName, VHost, User#user.username, + CS, Channel, Reason]), + wait_for_channel_termination( + N-1, TimerRef, State1) end; cancel_wait -> exit(channel_termination_timeout) |