You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/07/12 12:30:45 UTC
svn commit: r1360618 - in /tomcat/trunk/java/org/apache/tomcat/jni/socket:
AprSocket.java AprSocketContext.java
Author: markt
Date: Thu Jul 12 10:30:44 2012
New Revision: 1360618
URL: http://svn.apache.org/viewvc?rev=1360618&view=rev
Log:
Clean up debug logging
Modified:
tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java
Modified: tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java?rev=1360618&r1=1360617&r2=1360618&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java Thu Jul 12 10:30:44 2012
@@ -56,9 +56,10 @@ import org.apache.tomcat.jni.socket.AprS
*/
public class AprSocket implements Runnable {
- static final byte[][] NO_CERTS = new byte[0][];
+ private static final Logger log =
+ Logger.getLogger("org.apache.tomcat.jni.socket.AprSocket");
- static Logger log = Logger.getLogger("AprSocket");
+ static final byte[][] NO_CERTS = new byte[0][];
static int CONNECTING = 1;
static int CONNECTED = 0x2;
@@ -280,7 +281,7 @@ public class AprSocket implements Runnab
updatePolling();
return rt;
}
- if (context.debug) {
+ if (log.isLoggable(Level.WARNING)) {
log.warning("apr.send(): Failed to send, closing " + sent);
}
reset();
@@ -407,7 +408,7 @@ public class AprSocket implements Runnab
if (context.rawDataHandler != null) {
context.rawDataHandler.rawData(this, false, null, -1, -1, -1, true);
}
- if (context.debug) {
+ if (log.isLoggable(Level.FINE)) {
log.info("closing: context.open=" + context.open.get() + " " + this);
}
@@ -725,7 +726,7 @@ public class AprSocket implements Runnab
try {
context.open.incrementAndGet();
- if (context.debug) {
+ if (log.isLoggable(Level.FINE)) {
log.info("Accept: " + context.open.get() + " " + this + " " +
getRemotePort());
}
@@ -795,7 +796,7 @@ public class AprSocket implements Runnab
}
try {
- if (context.debug) {
+ if (log.isLoggable(Level.FINE)) {
log.info(this + " StartSSL");
}
@@ -851,7 +852,7 @@ public class AprSocket implements Runnab
int ticketLen = SSLExt.getTicket(socket, hostInfo.ticket);
if (ticketLen > 0) {
hostInfo.ticketLen = ticketLen;
- if (context.debug) {
+ if (log.isLoggable(Level.FINE)) {
log.info("Received ticket: " + ticketLen);
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java?rev=1360618&r1=1360617&r2=1360618&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java Thu Jul 12 10:30:44 2012
@@ -184,7 +184,6 @@ public class AprSocketContext {
// Separate executor for connect/handshakes
ExecutorService connectExecutor;
- boolean debug = false;
boolean debugSSL = false;
boolean debugPoll = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1360618 - in /tomcat/trunk/java/org/apache/tomcat/jni/socket:
AprSocket.java AprSocketContext.java
Posted by Mark Thomas <ma...@apache.org>.
On 12/07/2012 11:48, Rainer Jung wrote:
> On 12.07.2012 12:30, markt@apache.org wrote:
>> Author: markt
>> Date: Thu Jul 12 10:30:44 2012
>> New Revision: 1360618
>>
>> URL: http://svn.apache.org/viewvc?rev=1360618&view=rev
>> Log:
>> Clean up debug logging
>>
>> Modified:
>> tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
>> tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java
>>
>> Modified: tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java?rev=1360618&r1=1360617&r2=1360618&view=diff
>>
>> ==============================================================================
>>
>> --- tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
>> (original)
>> +++ tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java Thu
>> Jul 12 10:30:44 2012
>> @@ -56,9 +56,10 @@ import org.apache.tomcat.jni.socket.AprS
>> */
>> public class AprSocket implements Runnable {
>>
>> - static final byte[][] NO_CERTS = new byte[0][];
>> + private static final Logger log =
>> + Logger.getLogger("org.apache.tomcat.jni.socket.AprSocket");
>>
>> - static Logger log = Logger.getLogger("AprSocket");
>> + static final byte[][] NO_CERTS = new byte[0][];
>>
>> static int CONNECTING = 1;
>> static int CONNECTED = 0x2;
>> @@ -280,7 +281,7 @@ public class AprSocket implements Runnab
>> updatePolling();
>> return rt;
>> }
>> - if (context.debug) {
>> + if (log.isLoggable(Level.WARNING)) {
>
> debug && warning replaced by unconditional WARNING?
> In all other cases you changed debug && info to FINE.
Since the check and the log level were inconsistent, I had to go one way
or the other. If I made the wrong choice we can always reduce the log
level later.
There is also no need for the level check here either. I'll remove it.
Cheers,
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1360618 - in /tomcat/trunk/java/org/apache/tomcat/jni/socket:
AprSocket.java AprSocketContext.java
Posted by Rainer Jung <ra...@kippdata.de>.
On 12.07.2012 12:30, markt@apache.org wrote:
> Author: markt
> Date: Thu Jul 12 10:30:44 2012
> New Revision: 1360618
>
> URL: http://svn.apache.org/viewvc?rev=1360618&view=rev
> Log:
> Clean up debug logging
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
> tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java
>
> Modified: tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java?rev=1360618&r1=1360617&r2=1360618&view=diff
> ==============================================================================
> --- tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java (original)
> +++ tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java Thu Jul 12 10:30:44 2012
> @@ -56,9 +56,10 @@ import org.apache.tomcat.jni.socket.AprS
> */
> public class AprSocket implements Runnable {
>
> - static final byte[][] NO_CERTS = new byte[0][];
> + private static final Logger log =
> + Logger.getLogger("org.apache.tomcat.jni.socket.AprSocket");
>
> - static Logger log = Logger.getLogger("AprSocket");
> + static final byte[][] NO_CERTS = new byte[0][];
>
> static int CONNECTING = 1;
> static int CONNECTED = 0x2;
> @@ -280,7 +281,7 @@ public class AprSocket implements Runnab
> updatePolling();
> return rt;
> }
> - if (context.debug) {
> + if (log.isLoggable(Level.WARNING)) {
debug && warning replaced by unconditional WARNING?
In all other cases you changed debug && info to FINE.
> log.warning("apr.send(): Failed to send, closing " + sent);
> }
> reset();
> @@ -407,7 +408,7 @@ public class AprSocket implements Runnab
> if (context.rawDataHandler != null) {
> context.rawDataHandler.rawData(this, false, null, -1, -1, -1, true);
> }
> - if (context.debug) {
> + if (log.isLoggable(Level.FINE)) {
> log.info("closing: context.open=" + context.open.get() + " " + this);
> }
>
> @@ -725,7 +726,7 @@ public class AprSocket implements Runnab
> try {
> context.open.incrementAndGet();
>
> - if (context.debug) {
> + if (log.isLoggable(Level.FINE)) {
> log.info("Accept: " + context.open.get() + " " + this + " " +
> getRemotePort());
> }
> @@ -795,7 +796,7 @@ public class AprSocket implements Runnab
> }
>
> try {
> - if (context.debug) {
> + if (log.isLoggable(Level.FINE)) {
> log.info(this + " StartSSL");
> }
>
> @@ -851,7 +852,7 @@ public class AprSocket implements Runnab
> int ticketLen = SSLExt.getTicket(socket, hostInfo.ticket);
> if (ticketLen > 0) {
> hostInfo.ticketLen = ticketLen;
> - if (context.debug) {
> + if (log.isLoggable(Level.FINE)) {
> log.info("Received ticket: " + ticketLen);
> }
> }
>
Regards,
Rainer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org