You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by hc...@apache.org on 2014/09/29 23:56:23 UTC
git commit: THRIFT-2663: py - per module logger used in python lib
Repository: thrift
Updated Branches:
refs/heads/master 485d71acd -> 3a724e37d
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
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/3a724e37
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/3a724e37
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/3a724e37
Branch: refs/heads/master
Commit: 3a724e37d49be1990fe2432c4ee7751653336c65
Parents: 485d71a
Author: Konrad Grochowski <hc...@apache.org>
Authored: Tue Aug 12 11:48:29 2014 -0400
Committer: Konrad Grochowski <hc...@apache.org>
Committed: Mon Sep 29 23:55:47 2014 +0200
----------------------------------------------------------------------
lib/py/src/TTornado.py | 14 ++++++++------
lib/py/src/server/TNonblockingServer.py | 12 +++++++-----
lib/py/src/server/TProcessPoolServer.py | 10 ++++++----
lib/py/src/server/TServer.py | 24 +++++++++++++-----------
4 files changed, 34 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/3a724e37/lib/py/src/TTornado.py
----------------------------------------------------------------------
diff --git a/lib/py/src/TTornado.py b/lib/py/src/TTornado.py
index c8498c5..7cd87ed 100644
--- a/lib/py/src/TTornado.py
+++ b/lib/py/src/TTornado.py
@@ -18,10 +18,12 @@
#
from __future__ import absolute_import
-import logging
import socket
import struct
+import logging
+logger = logging.getLogger(__name__)
+
from thrift.transport.TTransport import TTransportException, TTransportBase, TMemoryBuffer
from io import BytesIO
@@ -79,7 +81,7 @@ class TTornadoStreamTransport(TTransportBase):
@gen.coroutine
def open(self, timeout=None):
- logging.debug('socket connecting')
+ logger.debug('socket connecting')
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, 0)
self.stream = iostream.IOStream(sock)
@@ -135,9 +137,9 @@ class TTornadoStreamTransport(TTransportBase):
if len(frame_header) == 0:
raise iostream.StreamClosedError('Read zero bytes from stream')
frame_length, = struct.unpack('!i', frame_header)
- logging.debug('received frame header, frame length = %d', frame_length)
+ logger.debug('received frame header, frame length = %d', frame_length)
frame = yield self.stream.read_bytes(frame_length)
- logging.debug('received frame payload: %r', frame)
+ logger.debug('received frame payload: %r', frame)
raise gen.Return(frame)
def write(self, buf):
@@ -176,7 +178,7 @@ class TTornadoServer(tcpserver.TCPServer):
iprot = self._iprot_factory.getProtocol(tr)
yield self._processor.process(iprot, oprot)
except Exception:
- logging.exception('thrift exception in handle_stream')
+ logger.exception('thrift exception in handle_stream')
trans.close()
- logging.info('client disconnected %s:%d', host, port)
+ logger.info('client disconnected %s:%d', host, port)
http://git-wip-us.apache.org/repos/asf/thrift/blob/3a724e37/lib/py/src/server/TNonblockingServer.py
----------------------------------------------------------------------
diff --git a/lib/py/src/server/TNonblockingServer.py b/lib/py/src/server/TNonblockingServer.py
index fa478d0..4a035b6 100644
--- a/lib/py/src/server/TNonblockingServer.py
+++ b/lib/py/src/server/TNonblockingServer.py
@@ -29,7 +29,9 @@ import socket
import Queue
import select
import struct
+
import logging
+logger = logging.getLogger(__name__)
from thrift.transport import TTransport
from thrift.protocol.TBinaryProtocol import TBinaryProtocolFactory
@@ -54,7 +56,7 @@ class Worker(threading.Thread):
processor.process(iprot, oprot)
callback(True, otrans.getvalue())
except Exception:
- logging.exception("Exception while processing request")
+ logger.exception("Exception while processing request")
callback(False, '')
WAIT_LEN = 0
@@ -116,18 +118,18 @@ class Connection:
# if we read 0 bytes and self.message is empty, then
# the client closed the connection
if len(self.message) != 0:
- logging.error("can't read frame size from socket")
+ logger.error("can't read frame size from socket")
self.close()
return
self.message += read
if len(self.message) == 4:
self.len, = struct.unpack('!i', self.message)
if self.len < 0:
- logging.error("negative frame size, it seems client "
+ logger.error("negative frame size, it seems client "
"doesn't use FramedTransport")
self.close()
elif self.len == 0:
- logging.error("empty frame, it's really strange")
+ logger.error("empty frame, it's really strange")
self.close()
else:
self.message = ''
@@ -145,7 +147,7 @@ class Connection:
elif self.status == WAIT_MESSAGE:
read = self.socket.recv(self.len - len(self.message))
if len(read) == 0:
- logging.error("can't read frame from socket (get %d of "
+ logger.error("can't read frame from socket (get %d of "
"%d bytes)" % (len(self.message), self.len))
self.close()
return
http://git-wip-us.apache.org/repos/asf/thrift/blob/3a724e37/lib/py/src/server/TProcessPoolServer.py
----------------------------------------------------------------------
diff --git a/lib/py/src/server/TProcessPoolServer.py b/lib/py/src/server/TProcessPoolServer.py
index 7369466..eefb623 100644
--- a/lib/py/src/server/TProcessPoolServer.py
+++ b/lib/py/src/server/TProcessPoolServer.py
@@ -19,6 +19,8 @@
import logging
+logger = logging.getLogger(__name__)
+
from multiprocessing import Process, Value, Condition, reduction
from TServer import TServer
@@ -62,7 +64,7 @@ class TProcessPoolServer(TServer):
except (KeyboardInterrupt, SystemExit):
return 0
except Exception, x:
- logging.exception(x)
+ logger.exception(x)
def serveClient(self, client):
"""Process input/output from a client for as long as possible"""
@@ -77,7 +79,7 @@ class TProcessPoolServer(TServer):
except TTransportException, tx:
pass
except Exception, x:
- logging.exception(x)
+ logger.exception(x)
itrans.close()
otrans.close()
@@ -98,7 +100,7 @@ class TProcessPoolServer(TServer):
w.start()
self.workers.append(w)
except Exception, x:
- logging.exception(x)
+ logger.exception(x)
# wait until the condition is set by stop()
while True:
@@ -109,7 +111,7 @@ class TProcessPoolServer(TServer):
except (SystemExit, KeyboardInterrupt):
break
except Exception, x:
- logging.exception(x)
+ logger.exception(x)
self.isRunning.value = False
http://git-wip-us.apache.org/repos/asf/thrift/blob/3a724e37/lib/py/src/server/TServer.py
----------------------------------------------------------------------
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 @@ class TSimpleServer(TServer):
except TTransport.TTransportException, tx:
pass
except Exception, x:
- logging.exception(x)
+ logger.exception(x)
itrans.close()
otrans.close()
@@ -113,7 +115,7 @@ class TThreadedServer(TServer):
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 @@ class TThreadedServer(TServer):
except TTransport.TTransportException, tx:
pass
except Exception, x:
- logging.exception(x)
+ logger.exception(x)
itrans.close()
otrans.close()
@@ -152,7 +154,7 @@ class TThreadPoolServer(TServer):
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 @@ class TThreadPoolServer(TServer):
except TTransport.TTransportException, tx:
pass
except Exception, x:
- logging.exception(x)
+ logger.exception(x)
itrans.close()
otrans.close()
@@ -179,7 +181,7 @@ class TThreadPoolServer(TServer):
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 @@ class TThreadPoolServer(TServer):
continue
self.clients.put(client)
except Exception, x:
- logging.exception(x)
+ logger.exception(x)
class TForkingServer(TServer):
@@ -215,7 +217,7 @@ class TForkingServer(TServer):
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 @@ class TForkingServer(TServer):
except TTransport.TTransportException, tx:
pass
except Exception, e:
- logging.exception(e)
+ logger.exception(e)
ecode = 1
finally:
try_close(itrans)
@@ -262,7 +264,7 @@ class TForkingServer(TServer):
except TTransport.TTransportException, tx:
pass
except Exception, x:
- logging.exception(x)
+ logger.exception(x)
def collect_children(self):
while self.children: