diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-05-12 13:48:04 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-05-12 13:48:04 +0100 |
| commit | 30429a73e4ab47ed32203290d46fb2e2ce4fa4ba (patch) | |
| tree | 5bcb22c8a2ff8ab220f163560c417ae5ac99b9a3 | |
| parent | 57bc69b6895cf0f6aca14082386e01666ceef48f (diff) | |
| download | rabbitmq-server-git-30429a73e4ab47ed32203290d46fb2e2ce4fa4ba.tar.gz | |
Monitor GM when going into a receive block.
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index ee889f8442..f18c319e5c 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -102,7 +102,15 @@ handle_go(Q = #amqqueue{name = QName}) -> process_flag(trap_exit, true), %% amqqueue_process traps exits too. {ok, GM} = gm:start_link(QName, ?MODULE, [self()], fun rabbit_misc:execute_mnesia_transaction/1), - receive {joined, GM} -> ok end, + MRef = erlang:monitor(process, GM), + %% We ignore the DOWN message because we are also linked and + %% trapping exits, we just want to not get stuck and we will exit + %% later. + receive + {joined, GM} -> erlang:demonitor(MRef, [flush]), + ok; + {'DOWN', MRef, _, _, _} -> ok + end, Self = self(), Node = node(), case rabbit_misc:execute_mnesia_transaction( |