From: David Reiss Date: Mon, 30 Jun 2008 19:13:23 +0000 (+0000) Subject: (THRIFT-12) Make the Java library use java.util.logging instead of stdout. X-Git-Tag: 0.2.0~490 X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=fc0646481faaeccdc88bbd5d61b05a5da91f8a9b;p=common%2Fthrift.git (THRIFT-12) Make the Java library use java.util.logging instead of stdout. git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@672868 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/lib/java/src/com/facebook/thrift/server/TSimpleServer.java b/lib/java/src/com/facebook/thrift/server/TSimpleServer.java index bf66843c..1c252610 100644 --- a/lib/java/src/com/facebook/thrift/server/TSimpleServer.java +++ b/lib/java/src/com/facebook/thrift/server/TSimpleServer.java @@ -6,6 +6,9 @@ package com.facebook.thrift.server; +import java.util.logging.Level; +import java.util.logging.Logger; + import com.facebook.thrift.TException; import com.facebook.thrift.TProcessor; import com.facebook.thrift.TProcessorFactory; @@ -23,6 +26,8 @@ import com.facebook.thrift.transport.TTransportException; */ public class TSimpleServer extends TServer { + private static final Logger LOGGER = Logger.getLogger(TSimpleServer.class.getName()); + private boolean stopped_ = false; public TSimpleServer(TProcessor processor, @@ -77,7 +82,7 @@ public class TSimpleServer extends TServer { try { serverTransport_.listen(); } catch (TTransportException ttx) { - ttx.printStackTrace(); + LOGGER.log(Level.SEVERE, "Error occurred during listening.", ttx); return; } @@ -102,11 +107,11 @@ public class TSimpleServer extends TServer { // Client died, just move on } catch (TException tx) { if (!stopped_) { - tx.printStackTrace(); + LOGGER.log(Level.SEVERE, "Thrift error occurred during processing of message.", tx); } } catch (Exception x) { if (!stopped_) { - x.printStackTrace(); + LOGGER.log(Level.SEVERE, "Error occurred during processing of message.", x); } } diff --git a/lib/java/src/com/facebook/thrift/server/TThreadPoolServer.java b/lib/java/src/com/facebook/thrift/server/TThreadPoolServer.java index 7b970712..13f83a12 100644 --- a/lib/java/src/com/facebook/thrift/server/TThreadPoolServer.java +++ b/lib/java/src/com/facebook/thrift/server/TThreadPoolServer.java @@ -22,6 +22,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import java.util.logging.Level; +import java.util.logging.Logger; /** @@ -32,6 +34,8 @@ import java.util.concurrent.TimeUnit; */ public class TThreadPoolServer extends TServer { + private static final Logger LOGGER = Logger.getLogger(TThreadPoolServer.class.getName()); + // Executor service for handling client connections private ExecutorService executorService_; @@ -156,7 +160,7 @@ public class TThreadPoolServer extends TServer { try { serverTransport_.listen(); } catch (TTransportException ttx) { - ttx.printStackTrace(); + LOGGER.log(Level.SEVERE, "Error occurred during listening.", ttx); return; } @@ -170,7 +174,7 @@ public class TThreadPoolServer extends TServer { } catch (TTransportException ttx) { if (!stopped_) { ++failureCount; - ttx.printStackTrace(); + LOGGER.log(Level.WARNING, "Transport error occurred during acceptance of message.", ttx); } } } @@ -237,9 +241,9 @@ public class TThreadPoolServer extends TServer { } catch (TTransportException ttx) { // Assume the client died and continue silently } catch (TException tx) { - tx.printStackTrace(); + LOGGER.log(Level.SEVERE, "Thrift error occurred during processing of message.", tx); } catch (Exception x) { - x.printStackTrace(); + LOGGER.log(Level.SEVERE, "Error occurred during processing of message.", x); } if (inputTransport != null) { diff --git a/lib/java/src/com/facebook/thrift/transport/TIOStreamTransport.java b/lib/java/src/com/facebook/thrift/transport/TIOStreamTransport.java index 5fef3b74..fd561ed2 100644 --- a/lib/java/src/com/facebook/thrift/transport/TIOStreamTransport.java +++ b/lib/java/src/com/facebook/thrift/transport/TIOStreamTransport.java @@ -9,6 +9,8 @@ package com.facebook.thrift.transport; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.util.logging.Level; +import java.util.logging.Logger; /** * This is the most commonly used base transport. It takes an InputStream @@ -20,6 +22,8 @@ import java.io.OutputStream; */ public class TIOStreamTransport extends TTransport { + private static final Logger LOGGER = Logger.getLogger(TIOStreamTransport.class.getName()); + /** Underlying inputStream */ protected InputStream inputStream_ = null; @@ -84,8 +88,7 @@ public class TIOStreamTransport extends TTransport { try { inputStream_.close(); } catch (IOException iox) { - System.err.println("WARNING: Error closing input stream: " + - iox.getMessage()); + LOGGER.log(Level.WARNING, "Error closing input stream.", iox); } inputStream_ = null; } @@ -93,8 +96,7 @@ public class TIOStreamTransport extends TTransport { try { outputStream_.close(); } catch (IOException iox) { - System.err.println("WARNING: Error closing output stream: " + - iox.getMessage()); + LOGGER.log(Level.WARNING, "Error closing output stream.", iox); } outputStream_ = null; } diff --git a/lib/java/src/com/facebook/thrift/transport/TServerSocket.java b/lib/java/src/com/facebook/thrift/transport/TServerSocket.java index 2692ac43..14a925b3 100644 --- a/lib/java/src/com/facebook/thrift/transport/TServerSocket.java +++ b/lib/java/src/com/facebook/thrift/transport/TServerSocket.java @@ -11,6 +11,8 @@ import java.net.InetSocketAddress; import java.net.ServerSocket; import java.net.Socket; import java.net.SocketException; +import java.util.logging.Level; +import java.util.logging.Logger; /** * Wrapper around ServerSocket for Thrift. @@ -19,6 +21,8 @@ import java.net.SocketException; */ public class TServerSocket extends TServerTransport { + private static final Logger LOGGER = Logger.getLogger(TServerSocket.class.getName()); + /** * Underlying serversocket object */ @@ -81,7 +85,7 @@ public class TServerSocket extends TServerTransport { try { serverSocket_.setSoTimeout(0); } catch (SocketException sx) { - sx.printStackTrace(); + LOGGER.log(Level.WARNING, "Could not set socket timeout.", sx); } } } @@ -105,8 +109,7 @@ public class TServerSocket extends TServerTransport { try { serverSocket_.close(); } catch (IOException iox) { - System.err.println("WARNING: Could not close server socket: " + - iox.getMessage()); + LOGGER.log(Level.WARNING, "Could not close server socket.", iox); } serverSocket_ = null; } diff --git a/lib/java/src/com/facebook/thrift/transport/TSocket.java b/lib/java/src/com/facebook/thrift/transport/TSocket.java index 20538502..c30a4786 100644 --- a/lib/java/src/com/facebook/thrift/transport/TSocket.java +++ b/lib/java/src/com/facebook/thrift/transport/TSocket.java @@ -12,6 +12,8 @@ import java.io.IOException; import java.net.InetSocketAddress; import java.net.Socket; import java.net.SocketException; +import java.util.logging.Level; +import java.util.logging.Logger; /** * Socket implementation of the TTransport interface. To be commented soon! @@ -20,6 +22,8 @@ import java.net.SocketException; */ public class TSocket extends TIOStreamTransport { + private static final Logger LOGGER = Logger.getLogger(TSocket.class.getName()); + /** * Wrapped Socket object */ @@ -52,7 +56,7 @@ public class TSocket extends TIOStreamTransport { socket_.setSoLinger(false, 0); socket_.setTcpNoDelay(true); } catch (SocketException sx) { - sx.printStackTrace(); + LOGGER.log(Level.WARNING, "Could not configure socket.", sx); } if (isOpen()) { @@ -102,7 +106,7 @@ public class TSocket extends TIOStreamTransport { socket_.setTcpNoDelay(true); socket_.setSoTimeout(timeout_); } catch (SocketException sx) { - sx.printStackTrace(); + LOGGER.log(Level.WARNING, "Could not configure socket.", sx); } } @@ -116,7 +120,7 @@ public class TSocket extends TIOStreamTransport { try { socket_.setSoTimeout(timeout); } catch (SocketException sx) { - sx.printStackTrace(); + LOGGER.log(Level.WARNING, "Could not set socket timeout.", sx); } } @@ -181,8 +185,7 @@ public class TSocket extends TIOStreamTransport { try { socket_.close(); } catch (IOException iox) { - System.err.println("WARNING: exception closing socket: " + - iox.getMessage()); + LOGGER.log(Level.WARNING, "Could not close socket.", iox); } socket_ = null; }