You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by al...@locus.apache.org on 2000/07/05 22:05:26 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util ThreadPool.java
alex 00/07/05 13:05:25
Modified: src/share/org/apache/tomcat/util ThreadPool.java
Log:
cleaned up log behavior (took out t.printStackTrace() and use
loghelper.log instead, with appropriate verbosity levels)
Revision Changes Path
1.10 +25 -10 jakarta-tomcat/src/share/org/apache/tomcat/util/ThreadPool.java
Index: ThreadPool.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/ThreadPool.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ThreadPool.java 2000/06/07 12:11:05 1.9
+++ ThreadPool.java 2000/07/05 20:05:23 1.10
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/ThreadPool.java,v 1.9 2000/06/07 12:11:05 shachor Exp $
- * $Revision: 1.9 $
- * $Date: 2000/06/07 12:11:05 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/ThreadPool.java,v 1.10 2000/07/05 20:05:23 alex Exp $
+ * $Revision: 1.10 $
+ * $Date: 2000/07/05 20:05:23 $
*
* ====================================================================
*
@@ -68,6 +68,8 @@
import java.util.*;
import java.io.*;
+import org.apache.tomcat.logging.*;
+
/**
* A thread pool that is trying to copy the apache process management.
*
@@ -125,6 +127,11 @@
protected boolean stopThePool;
static int debug=0;
+
+ /**
+ * Helper object for logging
+ **/
+ LogHelper loghelper = new LogHelper("tc_log", "ThreadPool");
public ThreadPool() {
maxThreads = MAX_THREADS;
@@ -202,8 +209,14 @@
while(currentThreadsBusy == currentThreadCount) {
try {
this.wait();
- } catch(Throwable t) {
- t.printStackTrace();
+ }
+ // was just catch Throwable -- but no other
+ // exceptions can be thrown by wait, right?
+ // So we catch and ignore this one, since
+ // it'll never actually happen, since nowhere
+ // do we say pool.interrupt().
+ catch(InterruptedException e) {
+ loghelper.log("Unexpected exception", e);
}
// Pool was stopped. Get away of the pool.
@@ -238,6 +251,7 @@
* Do nothing... The show must go on, we are shutting
* down the pool and nothing should stop that.
*/
+ loghelper.log("Ignored exception while shutting down thread pool", t, Logger.ERROR);
}
}
currentThreadsBusy = currentThreadCount = 0;
@@ -350,7 +364,7 @@
}
void log( String s ) {
- System.out.println("ThreadPool: " + s );
+ loghelper.log(s);
}
/**
@@ -382,11 +396,11 @@
break;
}
- // Harvest idel threads.
+ // Harvest idle threads.
p.checkSpareControllers();
} catch(Throwable t) {
- t.printStackTrace();
+ loghelper.log("Unexpected exception", t, Logger.ERROR);
}
}
}
@@ -484,7 +498,7 @@
toRun.runIt(thData);
}
} catch(Throwable t) {
- t.printStackTrace();
+ loghelper.log("Caught exception executing " + toRun.toString() + ", terminating thread", t);
/*
* The runnable throw an exception (can be even a ThreadDeath),
* signalling that the thread die.
@@ -513,7 +527,8 @@
break;
}
} catch(InterruptedException ie) { /* for the wait operation */
- ie.printStackTrace();
+ // can never happen, since we don't call interrupt
+ loghelper.log("Unexpected exception", ie);
}
}
}