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=6d79a662cd0d0685d0bf369e4d96103868f1a569;hpb=b072c117f63f2bfc3ccdf1614bfbe03877ea15c1;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 6d79a662c..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,8 +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.UUID; +import java.util.List; import javax.jms.Destination; import javax.jms.JMSException; @@ -12,51 +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.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.support.converter.MessageConverter; +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 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 MessageConverter messageConverter; + 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); - } - - public void setJmsTemplate(JmsTemplate jmsTemplate) { - this.jmsTemplate = jmsTemplate; + 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) { @@ -67,33 +91,110 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, this.agentUnregister = agentUnregister; } - public void onMessage(Message message) { - // FIXME: we filter the messages on the client side, - // because of a weird problem with selector since moving to OSGi + public String getMessageSelector() { + String messageSelector = "slc_agentId='" + getAgentUuid() + "'"; + // if (log.isDebugEnabled()) + // log.debug("Message selector: " + messageSelector); + return messageSelector; + } + + public void onMessage(final Message message) { + final String query; + final String correlationId; + try { + query = message.getStringProperty(PROPERTY_QUERY); + correlationId = message.getJMSCorrelationID(); + } catch (JMSException e1) { + throw new SlcException("Cannot analyze incoming message " + message); + } + + final Object response; + final Destination destinationSend; + if (QUERY_PING_ALL.equals(query)) { + ReferenceList refList = (ReferenceList) convertFrom(message); + if (!refList.getReferences().contains(getAgentUuid())) { + response = getAgentDescriptor(); + destinationSend = agentRegister; + log.info("Agent #" + getAgentUuid() + " registering to " + + agentRegister + " in reply to a " + QUERY_PING_ALL + + " query"); + } else { + return; + } + } else { + response = process(query, message); + destinationSend = responseDestination; + } + + // 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 */ + public Object process(String query, Message message) { try { - if (message.getStringProperty("slc-agentId").equals( - agentDescriptor.getUuid())) { - runSlcExecution((SlcExecution) messageConverter - .fromMessage(message)); + if ("getExecutionModuleDescriptor".equals(query)) { + String moduleName = message.getStringProperty("moduleName"); + String version = message.getStringProperty("version"); + return getExecutionModuleDescriptor(moduleName, version); + } else if ("listExecutionModuleDescriptors".equals(query)) { + + List lst = listExecutionModuleDescriptors(); + SlcAgentDescriptor agentDescriptorToSend = new SlcAgentDescriptor( + getAgentDescriptor()); + agentDescriptorToSend.setModuleDescriptors(lst); + return agentDescriptorToSend; + } else if ("runSlcExecution".equals(query)) { + final SlcExecution slcExecution = (SlcExecution) convertFrom(message); + new Thread() { + public void run() { + runSlcExecution(slcExecution); + } + }.start(); + return ExecutionAnswer.ok("Execution started on agent " + + getAgentUuid()); + } else if ("ping".equals(query)) { + return ExecutionAnswer.ok("Agent " + getAgentUuid() + + " is alive."); + } else { + throw new SlcException("Unsupported query " + query); } - } catch (JMSException e) { - throw new SlcException("Cannot convert message " + message, e); + } catch (Exception e) { + log.error("Processing of query " + query + " failed", e); + return ExecutionAnswer.error(e); } + } + protected Object convertFrom(Message message) { + try { + return jmsTemplate.getMessageConverter().fromMessage(message); + } catch (JMSException e) { + throw new SlcException("Cannot convert message", e); + } } - public String getMessageSelector() { - String messageSelector = "slc-agentId=" + agentDescriptor.getUuid() - + ""; - // String messageSelector = "slc-agentId LIKE '%'"; - if (log.isDebugEnabled()) - log.debug("Message selector: '" + messageSelector + "'"); - return messageSelector; + public void setResponseDestination(Destination responseDestination) { + this.responseDestination = responseDestination; } - public void setMessageConverter(MessageConverter messageConverter) { - this.messageConverter = messageConverter; + public void setJmsTemplate(JmsTemplate jmsTemplate) { + this.jmsTemplate = jmsTemplate; } - - + }