diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-01-20 14:18:38 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-01-20 14:18:38 +0000 |
| commit | 28c6b18d0569ffe7b59b7a776d907be396a865b1 (patch) | |
| tree | 189ce3bd2ffc9aacab226cdb64e08a53105a5247 /src | |
| parent | f65f537b218312531ca3d8562dec5ecb467a0481 (diff) | |
| download | rabbitmq-server-git-28c6b18d0569ffe7b59b7a776d907be396a865b1.tar.gz | |
Correct formatting of resources in log messages
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_mirror_queue_coordinator.erl | 12 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/rabbit_mirror_queue_coordinator.erl b/src/rabbit_mirror_queue_coordinator.erl index 608148b5f4..d853a3e94c 100644 --- a/src/rabbit_mirror_queue_coordinator.erl +++ b/src/rabbit_mirror_queue_coordinator.erl @@ -74,19 +74,19 @@ 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 queue ~p: ~p~n", - [Q #amqqueue.name, Result]); + rabbit_log:info("Adding slave node for ~p: ~p~n", + [rabbit_misc:rs(Q #amqqueue.name), Result]); false -> rabbit_log:info( - "Ignoring request to add slave on node ~p for queue ~p~n", - [Q #amqqueue.name, Node]) + "Ignoring request to add slave on node ~p for ~p~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 queue ~p~n", - [self(), Deaths, QueueName]), + rabbit_log:info("Master ~p saw deaths ~p for ~p~n", + [self(), Deaths, rabbit_misc:rs(QueueName)]), case rabbit_mirror_queue_misc:remove_from_queue(QueueName, Deaths) of {ok, Pid} when node(Pid) =:= node() -> noreply(State); diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index a61cea0d14..483c849a92 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -164,8 +164,8 @@ 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 queue ~p~n", - [self(), Deaths, QueueName]), + rabbit_log:info("Slave ~p saw deaths ~p for ~p~n", + [self(), Deaths, rabbit_misc:rs(QueueName)]), case rabbit_mirror_queue_misc:remove_from_queue(QueueName, Deaths) of {ok, Pid} when node(Pid) =:= MNode -> reply(ok, State); @@ -325,8 +325,8 @@ promote_me(From, #state { q = Q, sender_queues = SQ, seen = Seen, guid_ack = GA }) -> - rabbit_log:info("Promoting slave ~p for queue ~p~n", - [self(), Q #amqqueue.name]), + rabbit_log:info("Promoting slave ~p for ~p~n", + [self(), rabbit_misc:rs(Q #amqqueue.name)]), {ok, CPid} = rabbit_mirror_queue_coordinator:start_link(Q, GM), true = unlink(GM), gen_server2:reply(From, {promote, CPid}), |