diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-04-16 13:25:38 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-04-16 13:25:38 +0100 |
| commit | f4d79ac0137ae0a8c82f8aaf275636eabd33c9d9 (patch) | |
| tree | 470e96e3d02c74ddf2d7e5c3a552ab3e3d954fff | |
| parent | dd51f2253093ebb1c03779915145fb47a6876fe4 (diff) | |
| parent | d322055e28be2bfbee71e9400d2aa55752795cf3 (diff) | |
| download | rabbitmq-server-git-f4d79ac0137ae0a8c82f8aaf275636eabd33c9d9.tar.gz | |
Merge bug26118
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | src/mirrored_supervisor.erl | 8 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_misc.erl | 4 |
3 files changed, 11 insertions, 6 deletions
@@ -194,6 +194,11 @@ run: all RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS)" \ ./scripts/rabbitmq-server +run-background: all + $(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \ + RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS)" \ + ./scripts/rabbitmq-server -detached + run-node: all $(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \ RABBITMQ_NODE_ONLY=true \ diff --git a/src/mirrored_supervisor.erl b/src/mirrored_supervisor.erl index 7a35245167..1ed6d71098 100644 --- a/src/mirrored_supervisor.erl +++ b/src/mirrored_supervisor.erl @@ -446,10 +446,10 @@ supervisor(Pid) -> with_exit_handler(fun() -> dead end, fun() -> delegate(Pid) end). write(Group, Overall, ChildSpec) -> - ok = mnesia:write( - #mirrored_sup_childspec{key = {Group, id(ChildSpec)}, - mirroring_pid = Overall, - childspec = ChildSpec}), + S = #mirrored_sup_childspec{key = {Group, id(ChildSpec)}, + mirroring_pid = Overall, + childspec = ChildSpec}, + ok = mnesia:write(?TABLE, S, write), ChildSpec. delete(Group, Id) -> diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl index a2f4eec539..ff1d5815a1 100644 --- a/src/rabbit_mirror_queue_misc.erl +++ b/src/rabbit_mirror_queue_misc.erl @@ -203,13 +203,13 @@ start_child(Name, MirrorNode, Q, SyncMode) -> report_deaths(_MirrorPid, _IsMaster, _QueueName, []) -> ok; report_deaths(MirrorPid, IsMaster, QueueName, DeadPids) -> - log_info(QueueName, "~s ~s saw deaths of mirrors ~s~n", + log_info(QueueName, "~s ~s saw deaths of mirrors~s~n", [case IsMaster of true -> "Master"; false -> "Slave" end, rabbit_misc:pid_to_string(MirrorPid), - [[rabbit_misc:pid_to_string(P), $ ] || P <- DeadPids]]). + [[$ , rabbit_misc:pid_to_string(P)] || P <- DeadPids]]). log_info (QName, Fmt, Args) -> log(info, QName, Fmt, Args). log_warning(QName, Fmt, Args) -> log(warning, QName, Fmt, Args). |