diff options
| author | Tim Watson <tim@rabbitmq.com> | 2012-07-25 09:49:08 +0100 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2012-07-25 09:49:08 +0100 |
| commit | b6928395bb115ce8cc10378e31dce18d2fa3e5d3 (patch) | |
| tree | 21f12916e7b6908fd7efe75e73a3492ce253ab2b | |
| parent | 3cca73829d015418366312979ac7b220e3925b74 (diff) | |
| download | rabbitmq-server-git-b6928395bb115ce8cc10378e31dce18d2fa3e5d3.tar.gz | |
match on supervisor:start_child/2 return values properly
| -rw-r--r-- | src/rabbit_mirror_queue_misc.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl index 31d855618e..42e1516adb 100644 --- a/src/rabbit_mirror_queue_misc.erl +++ b/src/rabbit_mirror_queue_misc.erl @@ -159,12 +159,12 @@ start_child(Name, MirrorNode, Q) -> rabbit_log:info("Adding mirror of ~s on node ~p: ~p~n", [rabbit_misc:rs(Name), MirrorNode, SPid]), ok; - {error, {stale_master_pid, StalePid}} -> + {error, {{stale_master_pid, StalePid}, _}} -> rabbit_log:warning("Detected stale HA master while adding " "mirror of ~s on node ~p: ~p~n", [rabbit_misc:rs(Name), MirrorNode, StalePid]), ok; - {error, {duplicate_live_master, _}=Err} -> + {error, {{duplicate_live_master, _}=Err, _}} -> throw(Err); Other -> Other |