few updates on logs

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.activemq / src / main / java / org / argeo / slc / jms / JmsAgent.java

diff --git a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgent.java b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgent.java
index 226f66f97d776aadf49e6f266a03024ef86d5c25..fecb5178bd311d278ea39c4acb8196515345e1ee 100644 (file)
--- a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgent.java
+++ b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgent.java
@@ -16,10 +16,7 @@
 
 package org.argeo.slc.jms;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.List;
-import java.util.UUID;
 
 import javax.jms.Destination;
 import javax.jms.JMSException;
@@ -50,32 +47,21 @@ public class JmsAgent extends DefaultAgent implements InitializingBean,
 
        private final static Log log = LogFactory.getLog(JmsAgent.class);
 
-       private final SlcAgentDescriptor agentDescriptor;
        private JmsTemplate jmsTemplate;
        private Destination agentRegister;
        private Destination agentUnregister;
 
        private Destination responseDestination;
 
-       public JmsAgent() {
-               try {
-                       agentDescriptor = new SlcAgentDescriptor();
-                       agentDescriptor.setUuid(UUID.randomUUID().toString());
-                       agentDescriptor.setHost(InetAddress.getLocalHost().getHostName());
-               } catch (UnknownHostException e) {
-                       throw new SlcException("Unable to create agent descriptor.", e);
-               }
-       }
-
        public void afterPropertiesSet() throws Exception {
                try {
-                       jmsTemplate.convertAndSend(agentRegister, agentDescriptor);
-                       log.info("Agent #" + agentDescriptor.getUuid() + " registered to "
+                       jmsTemplate.convertAndSend(agentRegister, getAgentDescriptor());
+                       log.info("Agent #" + getAgentUuid() + " registered to "
                                        + agentRegister);
                } catch (JmsException e) {
                        log
                                        .warn("Could not register agent "
-                                                       + agentDescriptor.getUuid()
+                                                       + getAgentDescriptor().getUuid()
                                                        + " to server: "
                                                        + e.getMessage()
                                                        + ". The agent will stay offline but will keep listening for a ping all sent by server.");
@@ -86,12 +72,12 @@ public class JmsAgent extends DefaultAgent implements InitializingBean,
 
        public void destroy() throws Exception {
                try {
-                       jmsTemplate.convertAndSend(agentUnregister, agentDescriptor);
-                       log.info("Agent #" + agentDescriptor.getUuid()
-                                       + " unregistered from " + agentUnregister);
+                       jmsTemplate.convertAndSend(agentUnregister, getAgentDescriptor());
+                       log.info("Agent #" + getAgentUuid() + " unregistered from "
+                                       + agentUnregister);
                } catch (JmsException e) {
-                       log.warn("Could not unregister agent " + agentDescriptor.getUuid()
-                                       + ": " + e.getMessage());
+                       log.warn("Could not unregister agent " + getAgentUuid() + ": "
+                                       + e.getMessage());
                        if (log.isTraceEnabled())
                                log.debug("Original error.", e);
                }
@@ -106,8 +92,7 @@ public class JmsAgent extends DefaultAgent implements InitializingBean,
        }
 
        public String getMessageSelector() {
-               String messageSelector = "slc_agentId='" + agentDescriptor.getUuid()
-                               + "'";
+               String messageSelector = "slc_agentId='" + getAgentUuid() + "'";
                // if (log.isDebugEnabled())
                // log.debug("Message selector: " + messageSelector);
                return messageSelector;
@@ -127,12 +112,12 @@ public class JmsAgent extends DefaultAgent implements InitializingBean,
                final Destination destinationSend;
                if (QUERY_PING_ALL.equals(query)) {
                        ReferenceList refList = (ReferenceList) convertFrom(message);
-                       if (!refList.getReferences().contains(agentDescriptor.getUuid())) {
-                               response = agentDescriptor;
+                       if (!refList.getReferences().contains(getAgentUuid())) {
+                               response = getAgentDescriptor();
                                destinationSend = agentRegister;
-                               log.info("Agent #" + agentDescriptor.getUuid()
-                                               + " registering to " + agentRegister
-                                               + " in reply to a " + QUERY_PING_ALL + " query");
+                               log.info("Agent #" + getAgentUuid() + " registering to "
+                                               + agentRegister + " in reply to a " + QUERY_PING_ALL
+                                               + " query");
                        } else {
                                return;
                        }
@@ -142,6 +127,8 @@ public class JmsAgent extends DefaultAgent implements InitializingBean,
                }
 
                // Send response
+               if (log.isTraceEnabled())
+                       log.trace("About to send response " + response.getClass());
                jmsTemplate.convertAndSend(destinationSend, response,
                                new MessagePostProcessor() {
                                        public Message postProcessMessage(Message messageToSend)
@@ -149,7 +136,7 @@ public class JmsAgent extends DefaultAgent implements InitializingBean,
                                                messageToSend.setStringProperty(PROPERTY_QUERY, query);
                                                messageToSend.setStringProperty(
                                                                MsgConstants.PROPERTY_SLC_AGENT_ID,
-                                                               agentDescriptor.getUuid());
+                                                               getAgentUuid());
                                                messageToSend.setJMSCorrelationID(correlationId);
                                                return messageToSend;
                                        }
@@ -170,7 +157,7 @@ public class JmsAgent extends DefaultAgent implements InitializingBean,
 
                                List<ExecutionModuleDescriptor> lst = listExecutionModuleDescriptors();
                                SlcAgentDescriptor agentDescriptorToSend = new SlcAgentDescriptor(
-                                               agentDescriptor);
+                                               getAgentDescriptor());
                                agentDescriptorToSend.setModuleDescriptors(lst);
                                return agentDescriptorToSend;
                        } else if ("runSlcExecution".equals(query)) {
@@ -181,9 +168,9 @@ public class JmsAgent extends DefaultAgent implements InitializingBean,
                                        }
                                }.start();
                                return ExecutionAnswer.ok("Execution started on agent "
-                                               + agentDescriptor.getUuid());
+                                               + getAgentUuid());
                        } else if ("ping".equals(query)) {
-                               return ExecutionAnswer.ok("Agent " + agentDescriptor.getUuid()
+                               return ExecutionAnswer.ok("Agent " + getAgentUuid()
                                                + " is alive.");
                        } else {
                                throw new SlcException("Unsupported query " + query);