summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2010-08-10 15:11:31 +0100
committerMatthew Sackman <matthew@rabbitmq.com>2010-08-10 15:11:31 +0100
commitca84b554b7a4ec4dadd951c0374829fa13fed5cb (patch)
tree59ff4cc5255976843644f9a5e8ec88084268a478
parent6fe45dcc722c13b093c90c934a4743adbfa17d9e (diff)
downloadrabbitmq-server-ca84b554b7a4ec4dadd951c0374829fa13fed5cb.tar.gz
I erroneously removed trap_exit on channel yesterday. It needs to be on because otherwise the gen_server won't call terminate when it's sent a shutdown signal
-rw-r--r--src/rabbit_channel.erl1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 050a5425..c68bb77d 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -155,6 +155,7 @@ flush(Pid) ->
init([Channel, ReaderPid, WriterPid, Username, VHost, CollectorPid,
StartLimiterFun]) ->
+ process_flag(trap_exit, true),
ok = pg_local:join(rabbit_channels, self()),
State = #ch{state = starting,
channel = Channel,