Remove superfluous logging

[gpl/argeo-slc.git] / runtime / org.argeo.slc.server / src / main / java / org / argeo / slc / services / EventPublisherAspect.java

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/EventPublisherAspect.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/EventPublisherAspect.java
index ea0ce12c3614d02b5987ff70d89a5fdf54995b0d..77a0d264f040f19667ce2a11d5480b7f550404f7 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/EventPublisherAspect.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/EventPublisherAspect.java
@@ -5,9 +5,11 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.slc.core.runtime.AbstractAgent;
+import org.argeo.slc.msg.MsgConstants;
 import org.argeo.slc.msg.event.SlcEvent;
 import org.argeo.slc.msg.event.SlcEventPublisher;
+import org.argeo.slc.msg.process.SlcExecutionStatusRequest;
+import org.argeo.slc.process.SlcExecution;
 import org.argeo.slc.runtime.SlcAgentDescriptor;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.After;
@@ -15,29 +17,55 @@ import org.aspectj.lang.annotation.Aspect;
 
 @Aspect
 public class EventPublisherAspect {
+       public final static String EVT_AGENT_REGISTERED = "agentRegistered";
+       public final static String EVT_AGENT_UNREGISTERED = "agentUnregistered";
+       public final static String EVT_NEW_SLC_EXECUTION = "newSlcExecution";
+       public final static String EVT_UPDATE_SLC_EXECUTION_STATUS = "updateSlcExecutionStatus";
+
        private final static Log log = LogFactory
                        .getLog(EventPublisherAspect.class);
 
        private List<SlcEventPublisher> eventPublishers;
 
-       @After("execution(void org.argeo.slc.services.runtime.AgentService.register(..))")
+       @After("execution(void org.argeo.slc.services.AgentService.register(..))")
        public void registerAgent(JoinPoint jp) throws Throwable {
                SlcAgentDescriptor agentDescriptor = (SlcAgentDescriptor) jp.getArgs()[0];
-               SlcEvent event = new SlcEvent("agentRegistered");
-               event.getHeaders().put(AbstractAgent.PROPERTY_SLC_AGENT_ID,
+               SlcEvent event = new SlcEvent(EVT_AGENT_REGISTERED);
+               event.getHeaders().put(MsgConstants.PROPERTY_SLC_AGENT_ID,
                                agentDescriptor.getUuid());
                publishEvent(event);
        }
 
-       @After("execution(void org.argeo.slc.services.runtime.AgentService.unregister(..))")
+       @After("execution(void org.argeo.slc.services.AgentService.unregister(..))")
        public void unregisterAgent(JoinPoint jp) throws Throwable {
                SlcAgentDescriptor agentDescriptor = (SlcAgentDescriptor) jp.getArgs()[0];
-               SlcEvent event = new SlcEvent("agentUnregistered");
-               event.getHeaders().put(AbstractAgent.PROPERTY_SLC_AGENT_ID,
+               SlcEvent event = new SlcEvent(EVT_AGENT_UNREGISTERED);
+               event.getHeaders().put(MsgConstants.PROPERTY_SLC_AGENT_ID,
                                agentDescriptor.getUuid());
                publishEvent(event);
        }
 
+       @After("execution(void org.argeo.slc.services.SlcExecutionService.newExecution(..))")
+       public void newSlcExecution(JoinPoint jp) throws Throwable {
+               SlcExecution slcExecution = (SlcExecution) jp.getArgs()[0];
+               SlcEvent event = new SlcEvent(EVT_NEW_SLC_EXECUTION);
+               event.getHeaders().put(MsgConstants.PROPERTY_SLC_EXECUTION_ID,
+                               slcExecution.getUuid());
+               publishEvent(event);
+       }
+
+       @After("execution(void org.argeo.slc.services.SlcExecutionService.updateStatus(..))")
+       public void updateSlcExecutionStatus(JoinPoint jp) throws Throwable {
+               SlcExecutionStatusRequest msg = (SlcExecutionStatusRequest) jp
+                               .getArgs()[0];
+               SlcEvent event = new SlcEvent(EVT_UPDATE_SLC_EXECUTION_STATUS);
+               event.getHeaders().put(MsgConstants.PROPERTY_SLC_EXECUTION_ID,
+                               msg.getSlcExecutionUuid());
+               event.getHeaders().put(MsgConstants.PROPERTY_SLC_EXECUTION_STATUS,
+                               msg.getNewStatus());
+               publishEvent(event);
+       }
+
        public void setEventPublishers(List<SlcEventPublisher> eventPublishers) {
                this.eventPublishers = eventPublishers;
        }