diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-19 13:05:33 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-19 13:05:33 +0100 |
| commit | 9ee2a3eb27eb6d23fcecd9e2bb1428b2caa3cc44 (patch) | |
| tree | b18d4faf6eac624be265c25ae2572a9ae7a896d9 | |
| parent | 1a9f6b9a1c14354944ed8f5a42a0ef3fa49c6507 (diff) | |
| parent | ad647273608465ba3e55ad01db3a06e162c990f7 (diff) | |
| download | rabbitmq-server-git-9ee2a3eb27eb6d23fcecd9e2bb1428b2caa3cc44.tar.gz | |
merge bug 24356 into default (pg2_fixed will blow up if compiled with R12B5)
| -rw-r--r-- | src/mirrored_supervisor.erl | 9 | ||||
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 11 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/mirrored_supervisor.erl b/src/mirrored_supervisor.erl index e273470fd9..8dfe39f890 100644 --- a/src/mirrored_supervisor.erl +++ b/src/mirrored_supervisor.erl @@ -311,9 +311,12 @@ init({overall, Group, Init}) -> Mirroring = {mirroring, {?MODULE, start_internal, [Group, ChildSpecs]}, permanent, 16#ffffffff, worker, [?MODULE]}, - %% Important: Delegate MUST start after Mirroring, see comment in - %% handle_info('DOWN', ...) below - {ok, {{one_for_all, 0, 1}, [Mirroring, Delegate]}}; + %% Important: Delegate MUST start before Mirroring so that + %% when we shut down from above it shuts down last, so + %% Mirroring does not see it die. + %% + %% See comment in handle_info('DOWN', ...) below + {ok, {{one_for_all, 0, 1}, [Delegate, Mirroring]}}; ignore -> ignore end; diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 11a95a6221..e5038efe39 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -817,10 +817,13 @@ emit_consumer_deleted(ChPid, ConsumerTag) -> prioritise_call(Msg, _From, _State) -> case Msg of - info -> 9; - {info, _Items} -> 9; - consumers -> 9; - _ -> 0 + info -> 9; + {info, _Items} -> 9; + consumers -> 9; + {basic_consume, _, _, _, _, _, _} -> 7; + {basic_cancel, _, _, _} -> 7; + stat -> 7; + _ -> 0 end. prioritise_cast(Msg, _State) -> |