You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2007/09/22 01:02:48 UTC

svn commit: r578313 - in /geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/request: Request.java RequestTimeoutException.java

Author: jdillon
Date: Fri Sep 21 16:02:46 2007
New Revision: 578313

URL: http://svn.apache.org/viewvc?rev=578313&view=rev
Log:
Tidy up some more logging, spit out more info when trace is enabled, else debug tersely 

Modified:
    geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/request/Request.java
    geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/request/RequestTimeoutException.java

Modified: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/request/Request.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/request/Request.java?rev=578313&r1=578312&r2=578313&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/request/Request.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/request/Request.java Fri Sep 21 16:02:46 2007
@@ -113,7 +113,7 @@
 
         Response resp = decodeResponse(responses.take());
 
-        log.trace("Got response: {}", resp);
+        log.trace("Received response: {}", resp);
 
         return resp;
     }
@@ -127,7 +127,7 @@
 
         if (log.isTraceEnabled()) {
             if (resp != null) {
-                log.trace("Got response: {}", resp);
+                log.trace("Received response: {}", resp);
             }
             else {
                 log.trace("Operation timed out before the response was signaled");
@@ -181,7 +181,12 @@
         assert response != null;
 
         synchronized (mutex) {
-            log.debug("Signal response: {}", response);
+            if (log.isTraceEnabled()) {
+                log.debug("Signal response: {}", response);
+            }
+            else {
+                log.debug("Signal response: {}", response.getRequest().getId());
+            }
 
             setResponse(response);
 
@@ -195,7 +200,12 @@
         assert e != null;
 
         synchronized (mutex) {
-            log.debug("Signal timeout: {}", e);
+            if (log.isTraceEnabled()) {
+                log.debug("Signal timeout: " + e, e);
+            }
+            else {
+                log.debug("Signal timeout: {}", e.getId());
+            }
 
             setResponse(e);
 

Modified: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/request/RequestTimeoutException.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/request/RequestTimeoutException.java?rev=578313&r1=578312&r2=578313&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/request/RequestTimeoutException.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/request/RequestTimeoutException.java Fri Sep 21 16:02:46 2007
@@ -29,7 +29,15 @@
 {
     private static final long serialVersionUID = 1;
 
-    public RequestTimeoutException(final Request req) {
-        super("Request timed out for ID: " + req.getId());
+    private final Object id;
+
+    public RequestTimeoutException(final Request request) {
+        super("Request timed out for ID: " + request.getId());
+
+        this.id = request.getId();
+    }
+
+    public Object getId() {
+        return id;
     }
 }