THRIFT-2663: py - per module logger used in python lib
Client: Python-Library
Patch: Dustin Spicuzza
This enables per module log message filtering
This closes #187
diff --git a/lib/py/src/server/TServer.py b/lib/py/src/server/TServer.py
index 976a8f3..00fd8cf 100644
--- a/lib/py/src/server/TServer.py
+++ b/lib/py/src/server/TServer.py
@@ -18,12 +18,14 @@
#
import Queue
-import logging
import os
import sys
import threading
import traceback
+import logging
+logger = logging.getLogger(__name__)
+
from thrift.Thrift import TProcessor
from thrift.protocol import TBinaryProtocol
from thrift.transport import TTransport
@@ -87,7 +89,7 @@
except TTransport.TTransportException, tx:
pass
except Exception, x:
- logging.exception(x)
+ logger.exception(x)
itrans.close()
otrans.close()
@@ -113,7 +115,7 @@
except KeyboardInterrupt:
raise
except Exception, x:
- logging.exception(x)
+ logger.exception(x)
def handle(self, client):
itrans = self.inputTransportFactory.getTransport(client)
@@ -126,7 +128,7 @@
except TTransport.TTransportException, tx:
pass
except Exception, x:
- logging.exception(x)
+ logger.exception(x)
itrans.close()
otrans.close()
@@ -152,7 +154,7 @@
client = self.clients.get()
self.serveClient(client)
except Exception, x:
- logging.exception(x)
+ logger.exception(x)
def serveClient(self, client):
"""Process input/output from a client for as long as possible"""
@@ -166,7 +168,7 @@
except TTransport.TTransportException, tx:
pass
except Exception, x:
- logging.exception(x)
+ logger.exception(x)
itrans.close()
otrans.close()
@@ -179,7 +181,7 @@
t.setDaemon(self.daemon)
t.start()
except Exception, x:
- logging.exception(x)
+ logger.exception(x)
# Pump the socket for clients
self.serverTransport.listen()
@@ -190,7 +192,7 @@
continue
self.clients.put(client)
except Exception, x:
- logging.exception(x)
+ logger.exception(x)
class TForkingServer(TServer):
@@ -215,7 +217,7 @@
try:
file.close()
except IOError, e:
- logging.warning(e, exc_info=True)
+ logger.warning(e, exc_info=True)
self.serverTransport.listen()
while True:
@@ -251,7 +253,7 @@
except TTransport.TTransportException, tx:
pass
except Exception, e:
- logging.exception(e)
+ logger.exception(e)
ecode = 1
finally:
try_close(itrans)
@@ -262,7 +264,7 @@
except TTransport.TTransportException, tx:
pass
except Exception, x:
- logging.exception(x)
+ logger.exception(x)
def collect_children(self):
while self.children: