few updates on logs

[gpl/argeo-slc.git] / runtime / org.argeo.slc.server / src / main / java / org / argeo / slc / web / mvc / controllers / EventController.java

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/controllers/EventController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/controllers/EventController.java
index b995a207d890df27eb7d00ac9d5a413efcf21047..8e997f6f254869fe8b9c124c3222b76e5f212564 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/controllers/EventController.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/controllers/EventController.java
@@ -35,8 +35,9 @@ public class EventController {
        private Long defaultTimeout = 10000l;\r
 \r
        // IoC\r
-       private SlcEventListenerRegister eventListenerRegister;\r
        private SlcEventListener eventListener = null;\r
+       // the following bean as a Session scope.\r
+       private SlcEventListenerRegister eventListenerRegister;\r
 \r
        // Business Methods\r
        @RequestMapping("/addEventListener.service")\r
@@ -47,10 +48,13 @@ public class EventController {
                eventListenerRegister\r
                                .addEventListenerDescriptor(new SlcEventListenerDescriptor(\r
                                                eventType, eventFilter));\r
-               if (log.isTraceEnabled())\r
+               if (log.isTraceEnabled()) {\r
                        log.trace("Registered listener on register "\r
                                        + eventListenerRegister.getId() + " for type " + eventType\r
                                        + ", filter=" + eventFilter);\r
+                       log.trace("Nb of registered descriptors : "\r
+                                       + eventListenerRegister.getDescriptorsCopy().size());\r
+               }\r
                return ExecutionAnswer.ok("Execution completed properly");\r
 \r
        }\r
@@ -63,10 +67,13 @@ public class EventController {
                eventListenerRegister\r
                                .removeEventListenerDescriptor(new SlcEventListenerDescriptor(\r
                                                eventType, eventFilter));\r
-               if (log.isTraceEnabled())\r
+               if (log.isTraceEnabled()) {\r
                        log.trace("Removed listener from register "\r
                                        + eventListenerRegister.getId() + " for type " + eventType\r
                                        + ", filter=" + eventFilter);\r
+                       log.trace("Nb of registered descriptors : "\r
+                                       + eventListenerRegister.getDescriptorsCopy().size());\r
+               }\r
                return ExecutionAnswer.ok("Execution completed properly");\r
        }\r
 \r
@@ -78,14 +85,23 @@ public class EventController {
                        timeout = Long.parseLong(timeoutStr);\r
                else\r
                        timeout = defaultTimeout;\r
-\r
+               if (log.isTraceEnabled()) {\r
+                       log.trace("Begin poolEvent.service :"\r
+                                       + " Nb of registered descriptors : "\r
+                                       + eventListenerRegister.getDescriptorsCopy().size());\r
+               }\r
                SlcEvent event = eventListener.listen(eventListenerRegister.getId(),\r
                                eventListenerRegister.getDescriptorsCopy(), timeout);\r
                if (event != null) {\r
+                       if (log.isTraceEnabled())\r
+                               log.trace("Event heard : " + event.toString());\r
                        return event;\r
                } else {\r
+                       if (log.isTraceEnabled())\r
+                               log.trace("No Event heard - Time out: ");\r
                        return ExecutionAnswer.ok("Execution completed properly");\r
                }\r
+\r
        }\r
 \r
        public void setEventListenerRegister(\r