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=226f66f97d776aadf49e6f266a03024ef86d5c25;hb=1fdb1b4e7b1d2b0cabb6483238301b857a6392fa;hp=6882ebaa45b3e16bb7be69d8cf05fac52b285dfc;hpb=a9bd656db864f3f648d375deef6833c2f53f29ba;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 6882ebaa4..226f66f97 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,8 +1,23 @@ +/* + * 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; @@ -10,28 +25,28 @@ import javax.jms.Destination; import javax.jms.JMSException; import javax.jms.Message; import javax.jms.MessageListener; -import javax.jms.TextMessage; 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); @@ -53,15 +68,33 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, } public void afterPropertiesSet() throws Exception { - jmsTemplate.convertAndSend(agentRegister, agentDescriptor); - log.info("Agent #" + agentDescriptor.getUuid() + " registered to " - + agentRegister); + try { + jmsTemplate.convertAndSend(agentRegister, agentDescriptor); + log.info("Agent #" + agentDescriptor.getUuid() + " registered to " + + agentRegister); + } catch (JmsException e) { + log + .warn("Could not register agent " + + agentDescriptor.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 destroy() throws Exception { - jmsTemplate.convertAndSend(agentUnregister, agentDescriptor); - log.info("Agent #" + agentDescriptor.getUuid() + " unregistered from " - + agentUnregister); + try { + jmsTemplate.convertAndSend(agentUnregister, agentDescriptor); + log.info("Agent #" + agentDescriptor.getUuid() + + " unregistered from " + agentUnregister); + } catch (JmsException e) { + log.warn("Could not unregister agent " + agentDescriptor.getUuid() + + ": " + e.getMessage()); + if (log.isTraceEnabled()) + log.debug("Original error.", e); + } } public void setAgentRegister(Destination agentRegister) { @@ -80,30 +113,6 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, 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; @@ -114,34 +123,40 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, throw new SlcException("Cannot analyze incoming message " + message); } - final Object response = process(query, message); - - new Thread() { - public void run() { - // Send response - jmsTemplate.convertAndSend(responseDestination, response, - new MessagePostProcessor() { - public Message postProcessMessage( - Message messageToSend) throws JMSException { - messageToSend - .setStringProperty( - PROPERTY_QUERY, - message - .getStringProperty(PROPERTY_QUERY)); - messageToSend.setStringProperty( - PROPERTY_SLC_AGENT_ID, agentDescriptor - .getUuid()); - messageToSend.setJMSCorrelationID(message - .getJMSCorrelationID()); - return messageToSend; - } - }); - if (log.isDebugEnabled()) - log.debug("Sent response to query " + query - + " with correlationId " + correlationId); + final Object response; + final Destination destinationSend; + if (QUERY_PING_ALL.equals(query)) { + ReferenceList refList = (ReferenceList) convertFrom(message); + if (!refList.getReferences().contains(agentDescriptor.getUuid())) { + response = agentDescriptor; + destinationSend = agentRegister; + log.info("Agent #" + agentDescriptor.getUuid() + + " registering to " + agentRegister + + " in reply to a " + QUERY_PING_ALL + " query"); + } else { + return; } - }.start(); + } else { + response = process(query, message); + destinationSend = responseDestination; + } + // Send response + 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, + agentDescriptor.getUuid()); + messageToSend.setJMSCorrelationID(correlationId); + return messageToSend; + } + }); + if (log.isTraceEnabled()) + log.debug("Sent response to query '" + query + + "' with correlationId " + correlationId); } /** @return response */ @@ -159,8 +174,12 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, 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()); } else if ("ping".equals(query)) { @@ -175,8 +194,12 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, } } - protected Object convertFrom(Message message) throws JMSException { - return jmsTemplate.getMessageConverter().fromMessage(message); + protected Object convertFrom(Message message) { + try { + return jmsTemplate.getMessageConverter().fromMessage(message); + } catch (JMSException e) { + throw new SlcException("Cannot convert message", e); + } } public void setResponseDestination(Destination responseDestination) {