summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/rabbit_mirror_queue_coordinator.erl6
-rw-r--r--src/rabbit_mirror_queue_slave.erl4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_mirror_queue_coordinator.erl b/src/rabbit_mirror_queue_coordinator.erl
index d853a3e94c..30fd6ed34d 100644
--- a/src/rabbit_mirror_queue_coordinator.erl
+++ b/src/rabbit_mirror_queue_coordinator.erl
@@ -74,18 +74,18 @@ handle_cast({add_slave, Node}, State = #state { q = Q }) ->
case lists:member(Node, Nodes) of
true ->
Result = rabbit_mirror_queue_slave_sup:start_child(Node, [Q]),
- rabbit_log:info("Adding slave node for ~p: ~p~n",
+ rabbit_log:info("Adding slave node for ~s: ~p~n",
[rabbit_misc:rs(Q #amqqueue.name), Result]);
false ->
rabbit_log:info(
- "Ignoring request to add slave on node ~p for ~p~n",
+ "Ignoring request to add slave on node ~p for ~s~n",
[Node, rabbit_misc:rs(Q #amqqueue.name)])
end,
noreply(State);
handle_cast({gm_deaths, Deaths},
State = #state { q = #amqqueue { name = QueueName } }) ->
- rabbit_log:info("Master ~p saw deaths ~p for ~p~n",
+ rabbit_log:info("Master ~p saw deaths ~p for ~s~n",
[self(), Deaths, rabbit_misc:rs(QueueName)]),
case rabbit_mirror_queue_misc:remove_from_queue(QueueName, Deaths) of
{ok, Pid} when node(Pid) =:= node() ->
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl
index 483c849a92..4f9d2066be 100644
--- a/src/rabbit_mirror_queue_slave.erl
+++ b/src/rabbit_mirror_queue_slave.erl
@@ -164,7 +164,7 @@ handle_call({gm_deaths, Deaths}, From,
State = #state { q = #amqqueue { name = QueueName },
gm = GM,
master_node = MNode }) ->
- rabbit_log:info("Slave ~p saw deaths ~p for ~p~n",
+ rabbit_log:info("Slave ~p saw deaths ~p for ~s~n",
[self(), Deaths, rabbit_misc:rs(QueueName)]),
case rabbit_mirror_queue_misc:remove_from_queue(QueueName, Deaths) of
{ok, Pid} when node(Pid) =:= MNode ->
@@ -325,7 +325,7 @@ promote_me(From, #state { q = Q,
sender_queues = SQ,
seen = Seen,
guid_ack = GA }) ->
- rabbit_log:info("Promoting slave ~p for ~p~n",
+ rabbit_log:info("Promoting slave ~p for ~s~n",
[self(), rabbit_misc:rs(Q #amqqueue.name)]),
{ok, CPid} = rabbit_mirror_queue_coordinator:start_link(Q, GM),
true = unlink(GM),