You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/12/01 10:28:38 UTC
[1/2] git commit: updated refs/heads/master to d31b58f
Repository: cloudstack
Updated Branches:
refs/heads/master 4ecfc2926 -> d31b58fe9
Show Agent name in Ping response
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/da85e986
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/da85e986
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/da85e986
Branch: refs/heads/master
Commit: da85e9861a876de2dd8b1be1dde86469bda8a33b
Parents: 20dcc25
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Mon Nov 30 16:13:45 2015 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Mon Nov 30 16:13:45 2015 +0100
----------------------------------------------------------------------
.../src/com/cloud/agent/manager/AgentManagerImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/da85e986/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
index 73feeeb..9340932 100644
--- a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -1181,15 +1181,16 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
}
final long hostId = attache.getId();
+ final String hostName = attache.getName();
if (s_logger.isDebugEnabled()) {
if (cmd instanceof PingRoutingCommand) {
logD = false;
- s_logger.debug("Ping from " + hostId);
+ s_logger.debug("Ping from " + hostId + "(" + hostName + ")");
s_logger.trace("SeqA " + hostId + "-" + request.getSequence() + ": Processing " + request);
} else if (cmd instanceof PingCommand) {
logD = false;
- s_logger.debug("Ping from " + hostId);
+ s_logger.debug("Ping from " + hostId + "(" + hostName + ")");
s_logger.trace("SeqA " + attache.getId() + "-" + request.getSequence() + ": Processing " + request);
} else {
s_logger.debug("SeqA " + attache.getId() + "-" + request.getSequence() + ": Processing " + request);
[2/2] git commit: updated refs/heads/master to d31b58f
Posted by bh...@apache.org.
Merge pull request #1143 from wido/agent-ping-name
Show Agent name in Ping responseBefore:
<pre>DEBUG [c.c.a.m.AgentManagerImpl] (AgentManager-Handler-4:null) Ping from 66</pre>
After:
<pre>DEBUG [c.c.a.m.AgentManagerImpl] (AgentManager-Handler-4:null) Ping from 66 (n01)</pre>
Makes it easier to search for hosts in the logs. Most loglines contain both the hostId and hostName.
* pr/1143:
Show Agent name in Ping response
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d31b58fe
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d31b58fe
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d31b58fe
Branch: refs/heads/master
Commit: d31b58fe9477e95975df6c5cb0fc884a27a2553f
Parents: 4ecfc29 da85e98
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Tue Dec 1 14:58:24 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Dec 1 14:58:25 2015 +0530
----------------------------------------------------------------------
.../src/com/cloud/agent/manager/AgentManagerImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------