Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 66351 invoked from network); 26 Sep 2008 17:52:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Sep 2008 17:52:50 -0000 Received: (qmail 49492 invoked by uid 500); 26 Sep 2008 17:52:48 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 49352 invoked by uid 500); 26 Sep 2008 17:52:48 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 49343 invoked by uid 99); 26 Sep 2008 17:52:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Sep 2008 10:52:48 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Sep 2008 17:51:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 49E7023888A0; Fri, 26 Sep 2008 10:52:29 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r699434 - in /geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request: RequestHandle.java RequestManager.java Date: Fri, 26 Sep 2008 17:52:29 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080926175229.49E7023888A0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jdillon Date: Fri Sep 26 10:52:28 2008 New Revision: 699434 URL: http://svn.apache.org/viewvc?rev=699434&view=rev Log: Clean up request logging Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/RequestHandle.java geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/RequestManager.java Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/RequestHandle.java URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/RequestHandle.java?rev=699434&r1=699433&r2=699434&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/RequestHandle.java (original) +++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/RequestHandle.java Fri Sep 26 10:52:28 2008 @@ -107,7 +107,7 @@ public ResponseHandle awaitResponse() throws RequestTimeoutException, InterruptedException { chechEndOfResponses(); - log.debug("Waiting for response"); + log.trace("Waiting for response"); ResponseHandle resp = decodeResponse(responses.take()); @@ -119,7 +119,7 @@ public ResponseHandle awaitResponse(final long timeout, final TimeUnit unit) throws RequestTimeoutException, InterruptedException { chechEndOfResponses(); - log.debug("Polling for response"); + log.trace("Polling for response"); ResponseHandle resp = decodeResponse(responses.poll(timeout, unit)); @@ -178,10 +178,10 @@ try { if (log.isTraceEnabled()) { - log.debug("Signal response: {}", response); + log.trace("Signal response: {}", response); } else { - log.debug("Signal response: {}", response.getRequest().getId()); + log.trace("Signal response: {}", response.getRequest().getId()); } queueResponse(response); @@ -199,7 +199,7 @@ lock.lock(); try { - log.debug("Timeout"); + log.trace("Timeout"); queueResponse(RequestTimeoutException.class); Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/RequestManager.java URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/RequestManager.java?rev=699434&r1=699433&r2=699434&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/RequestManager.java (original) +++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/RequestManager.java Fri Sep 26 10:52:28 2008 @@ -114,7 +114,7 @@ registrations.put(id, reg); - log.debug("Registered: {}", reg); + log.trace("Registered: {}", reg); } finally { lock.unlock(); @@ -146,7 +146,7 @@ reg.deactivate(); - log.debug("Deregistered: {}", reg); + log.trace("Deregistered: {}", reg); return reg.request; } @@ -165,11 +165,11 @@ reg.activate(); - log.debug("Activated: {}", reg); + log.trace("Activated: {}", reg); } catch (NotRegisteredException e) { // Sometimes we receive responses to requests faster than we can register them - log.debug("Ignoring activation; request not registered: {}", id); + log.trace("Ignoring activation; request not registered: {}", id); } finally { lock.unlock(); @@ -186,10 +186,10 @@ reg.deactivate(); - log.debug("Deactivated: {}", reg); + log.trace("Deactivated: {}", reg); } catch (NotRegisteredException e) { - log.debug("Ignoring deactivation; request not registered: {}", id); + log.trace("Ignoring deactivation; request not registered: {}", id); } finally { lock.unlock(); @@ -206,13 +206,13 @@ reg.timeout(); - log.debug("Timed out: {}", reg); + log.trace("Timed out: {}", reg); } catch (NotRegisteredException e) { - log.debug("Ignoring timeout; request not registered: {}", id); + log.trace("Ignoring timeout; request not registered: {}", id); } catch (TimeoutAbortedException e) { - log.debug("Timeout aborted: " + e.getMessage()); + log.trace("Timeout aborted: " + e.getMessage()); } finally { lock.unlock(); @@ -267,7 +267,7 @@ public void activate() { if (state != RegistrationState.PENDING) { - log.debug("Can not activate, state is not PENDING, found: {}", state); + log.trace("Can not activate, state is not PENDING, found: {}", state); } else { Runnable task = new Runnable() { @@ -278,7 +278,7 @@ Duration timeout = request.getTimeout(); - log.debug("Scheduling timeout to trigger in: {}", timeout); + log.trace("Scheduling timeout to trigger in: {}", timeout); timeoutFuture = scheduler.schedule(task, timeout.getValue(), timeout.getUnit()); @@ -288,7 +288,7 @@ public void deactivate() { if (state != RegistrationState.ACTIVE) { - log.debug("Can not deactivate; state is not ACTIVE, found: {}", state); + log.trace("Can not deactivate; state is not ACTIVE, found: {}", state); } else if (timeoutFuture.cancel(false)) { timeoutFuture = null; @@ -302,7 +302,7 @@ public void timeout() { if (state != RegistrationState.ACTIVE) { - log.debug("Can not timeout; state is not ACTIVE, found: {}", state); + log.trace("Can not timeout; state is not ACTIVE, found: {}", state); } else { Message.ID id = request.getId();