From: Bruno Sinou <bsinou@argeo.org>
Date: Wed, 4 Aug 2010 10:42:29 +0000 (+0000)
Subject: few updates on logs
X-Git-Tag: argeo-slc-2.1.7~1199
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=inline;h=e6e892ed3c2351212e16f2f404511ff5a8ce3c98;p=gpl%2Fargeo-slc.git

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 d9edbc8c2..f01a2560d 100644
--- 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 b995a207d..8e997f6f2 100644
--- 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;
 
 	// IoC
-	private SlcEventListenerRegister eventListenerRegister;
 	private SlcEventListener eventListener = null;
+	// the following bean as a Session scope.
+	private SlcEventListenerRegister eventListenerRegister;
 
 	// Business Methods
 	@RequestMapping("/addEventListener.service")
@@ -47,10 +48,13 @@ public class EventController {
 		eventListenerRegister
 				.addEventListenerDescriptor(new SlcEventListenerDescriptor(
 						eventType, eventFilter));
-		if (log.isTraceEnabled())
+		if (log.isTraceEnabled()) {
 			log.trace("Registered listener on register "
 					+ eventListenerRegister.getId() + " for type " + eventType
 					+ ", filter=" + eventFilter);
+			log.trace("Nb of registered descriptors : "
+					+ eventListenerRegister.getDescriptorsCopy().size());
+		}
 		return ExecutionAnswer.ok("Execution completed properly");
 
 	}
@@ -63,10 +67,13 @@ public class EventController {
 		eventListenerRegister
 				.removeEventListenerDescriptor(new SlcEventListenerDescriptor(
 						eventType, eventFilter));
-		if (log.isTraceEnabled())
+		if (log.isTraceEnabled()) {
 			log.trace("Removed listener from register "
 					+ eventListenerRegister.getId() + " for type " + eventType
 					+ ", filter=" + eventFilter);
+			log.trace("Nb of registered descriptors : "
+					+ eventListenerRegister.getDescriptorsCopy().size());
+		}
 		return ExecutionAnswer.ok("Execution completed properly");
 	}
 
@@ -78,14 +85,23 @@ public class EventController {
 			timeout = Long.parseLong(timeoutStr);
 		else
 			timeout = defaultTimeout;
-
+		if (log.isTraceEnabled()) {
+			log.trace("Begin poolEvent.service :"
+					+ " Nb of registered descriptors : "
+					+ eventListenerRegister.getDescriptorsCopy().size());
+		}
 		SlcEvent event = eventListener.listen(eventListenerRegister.getId(),
 				eventListenerRegister.getDescriptorsCopy(), timeout);
 		if (event != null) {
+			if (log.isTraceEnabled())
+				log.trace("Event heard : " + event.toString());
 			return event;
 		} else {
+			if (log.isTraceEnabled())
+				log.trace("No Event heard - Time out: ");
 			return ExecutionAnswer.ok("Execution completed properly");
 		}
+
 	}
 
 	public void setEventListenerRegister(