X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.activemq%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjms%2FJmsAgent.java;h=fecb5178bd311d278ea39c4acb8196515345e1ee;hb=856754d1c9381f2734f3583aba037efbbaaeab1d;hp=90818a572d0524c87a2bd7241560313af0204aa4;hpb=e1384618cb6d1c06ec570d7798b783fa04a3d807;p=gpl%2Fargeo-slc.git 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 90818a572..fecb5178b 100644 --- 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 @@ -1,10 +1,22 @@ +/* + * Copyright (C) 2010 Mathieu Baudier + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.argeo.slc.jms; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.ArrayList; import java.util.List; -import java.util.UUID; import javax.jms.Destination; import javax.jms.JMSException; @@ -14,56 +26,61 @@ import javax.jms.MessageListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.slc.SlcException; -import org.argeo.slc.core.runtime.AbstractAgent; -import org.argeo.slc.execution.ExecutionModule; +import org.argeo.slc.core.runtime.DefaultAgent; import org.argeo.slc.execution.ExecutionModuleDescriptor; import org.argeo.slc.msg.ExecutionAnswer; +import org.argeo.slc.msg.MsgConstants; import org.argeo.slc.msg.ReferenceList; import org.argeo.slc.process.SlcExecution; -import org.argeo.slc.runtime.SlcAgent; import org.argeo.slc.runtime.SlcAgentDescriptor; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; +import org.springframework.jms.JmsException; import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.core.MessagePostProcessor; /** JMS based implementation of SLC Agent. */ -public class JmsAgent extends AbstractAgent implements SlcAgent, - InitializingBean, DisposableBean, MessageListener { +public class JmsAgent extends DefaultAgent implements InitializingBean, + DisposableBean, MessageListener { public final static String PROPERTY_QUERY = "query"; - public final static String PROPERTY_SLC_AGENT_ID = "slc_agentId"; - public final static String QUERY_PING_ALL = "pingAll"; 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() { + public void afterPropertiesSet() throws Exception { 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); + jmsTemplate.convertAndSend(agentRegister, getAgentDescriptor()); + log.info("Agent #" + getAgentUuid() + " registered to " + + agentRegister); + } catch (JmsException e) { + log + .warn("Could not register agent " + + getAgentDescriptor().getUuid() + + " to server: " + + e.getMessage() + + ". The agent will stay offline but will keep listening for a ping all sent by server."); + if (log.isTraceEnabled()) + log.debug("Original error.", e); } } - public void afterPropertiesSet() throws Exception { - jmsTemplate.convertAndSend(agentRegister, agentDescriptor); - log.info("Agent #" + agentDescriptor.getUuid() + " registered to " - + agentRegister); - } - public void destroy() throws Exception { - jmsTemplate.convertAndSend(agentUnregister, agentDescriptor); - log.info("Agent #" + agentDescriptor.getUuid() + " unregistered from " - + agentUnregister); + try { + jmsTemplate.convertAndSend(agentUnregister, getAgentDescriptor()); + log.info("Agent #" + getAgentUuid() + " unregistered from " + + agentUnregister); + } catch (JmsException e) { + log.warn("Could not unregister agent " + getAgentUuid() + ": " + + e.getMessage()); + if (log.isTraceEnabled()) + log.debug("Original error.", e); + } } public void setAgentRegister(Destination agentRegister) { @@ -75,37 +92,12 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, } public String getMessageSelector() { - String messageSelector = "slc_agentId='" + agentDescriptor.getUuid() - + "'"; + String messageSelector = "slc_agentId='" + getAgentUuid() + "'"; // if (log.isDebugEnabled()) // log.debug("Message selector: " + messageSelector); return messageSelector; } - public ExecutionModuleDescriptor getExecutionModuleDescriptor( - String moduleName, String version) { - return getModulesManager().getExecutionModuleDescriptor(moduleName, - version); - } - - public List listExecutionModuleDescriptors() { - List modules = getModulesManager() - .listExecutionModules(); - - List descriptors = new ArrayList(); - for (ExecutionModule module : modules) { - ExecutionModuleDescriptor md = new ExecutionModuleDescriptor(); - md.setName(module.getName()); - md.setVersion(module.getVersion()); - descriptors.add(md); - } - return descriptors; - } - - public boolean ping() { - return true; - } - public void onMessage(final Message message) { final String query; final String correlationId; @@ -120,12 +112,12 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, 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; } @@ -134,29 +126,24 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, destinationSend = responseDestination; } - new Thread() { - public void run() { - // Send response - jmsTemplate.convertAndSend(destinationSend, response, - new MessagePostProcessor() { - public Message postProcessMessage( - Message messageToSend) throws JMSException { - messageToSend.setStringProperty(PROPERTY_QUERY, - query); - messageToSend.setStringProperty( - PROPERTY_SLC_AGENT_ID, agentDescriptor - .getUuid()); - messageToSend - .setJMSCorrelationID(correlationId); - return messageToSend; - } - }); - if (log.isDebugEnabled()) - log.debug("Sent response to query '" + query - + "' with correlationId " + correlationId); - } - }.start(); - + // Send response + if (log.isTraceEnabled()) + log.trace("About to send response " + response.getClass()); + jmsTemplate.convertAndSend(destinationSend, response, + new MessagePostProcessor() { + public Message postProcessMessage(Message messageToSend) + throws JMSException { + messageToSend.setStringProperty(PROPERTY_QUERY, query); + messageToSend.setStringProperty( + MsgConstants.PROPERTY_SLC_AGENT_ID, + getAgentUuid()); + messageToSend.setJMSCorrelationID(correlationId); + return messageToSend; + } + }); + if (log.isTraceEnabled()) + log.debug("Sent response to query '" + query + + "' with correlationId " + correlationId); } /** @return response */ @@ -170,16 +157,20 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, List lst = listExecutionModuleDescriptors(); SlcAgentDescriptor agentDescriptorToSend = new SlcAgentDescriptor( - agentDescriptor); + getAgentDescriptor()); agentDescriptorToSend.setModuleDescriptors(lst); return agentDescriptorToSend; } else if ("runSlcExecution".equals(query)) { - SlcExecution slcExecution = (SlcExecution) convertFrom(message); - runSlcExecution(slcExecution); + final SlcExecution slcExecution = (SlcExecution) convertFrom(message); + new Thread() { + public void run() { + runSlcExecution(slcExecution); + } + }.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);