few updates on logs

git-svn-id: https://svn.argeo.org/slc/trunk@3753 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/WebSlcEventListenerRegister.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/WebSlcEventListenerRegister.java
index d9edbc8c299aaf84a7eb22f5a61832da56a3e458..f01a2560decf75cd850415aa2668c2a61c0b69e4 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/WebSlcEventListenerRegister.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/WebSlcEventListenerRegister.java
@@ -31,7 +31,7 @@ public class WebSlcEventListenerRegister implements SlcEventListenerRegister,
 
        static final long serialVersionUID = 1l;
 
-       //private String clientId = UUID.randomUUID().toString();
+       // private String clientId = UUID.randomUUID().toString();
 
        /** Synchronized */
        private List<SlcEventListenerDescriptor> descriptors = new Vector<SlcEventListenerDescriptor>();
@@ -52,6 +52,10 @@ public class WebSlcEventListenerRegister implements SlcEventListenerRegister,
                return new ArrayList<SlcEventListenerDescriptor>(descriptors);
        }
 
+       public String getId() {
+               return RequestContextHolder.currentRequestAttributes().getSessionId();
+       }
+
        // public SlcEvent listen(SlcEventListener eventListener, Long timeout) {
        // return eventListener.listen(clientId, getDescriptorsCopy(), timeout);
        // }
@@ -81,8 +85,4 @@ public class WebSlcEventListenerRegister implements SlcEventListenerRegister,
        // return RequestContextHolder.currentRequestAttributes().getSessionId();
        // }
        //
-       public String getId() {
-               return RequestContextHolder.currentRequestAttributes().getSessionId();
-       }
-
 }

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