apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 18:43:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1143 from wido/agent-ping-name

Browse Source 
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 <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2015-12-01 14:58:24 +05:30
commit d31b58fe94
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
View File

@ -1181,15 +1181,16 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
} }
final long hostId = attache.getId(); final long hostId = attache.getId();
final String hostName = attache.getName();
if (s_logger.isDebugEnabled()) { if (s_logger.isDebugEnabled()) {
if (cmd instanceof PingRoutingCommand) { if (cmd instanceof PingRoutingCommand) {
logD = false; logD = false;
s_logger.debug("Ping from " + hostId); s_logger.debug("Ping from " + hostId + "(" + hostName + ")");
s_logger.trace("SeqA " + hostId + "-" + request.getSequence() + ": Processing " + request); s_logger.trace("SeqA " + hostId + "-" + request.getSequence() + ": Processing " + request);
} else if (cmd instanceof PingCommand) { } else if (cmd instanceof PingCommand) {
logD = false; 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); s_logger.trace("SeqA " + attache.getId() + "-" + request.getSequence() + ": Processing " + request);
} else { } else {
s_logger.debug("SeqA " + attache.getId() + "-" + request.getSequence() + ": Processing " + request); s_logger.debug("SeqA " + attache.getId() + "-" + request.getSequence() + ": Processing " + request);