openstack/deb-python-eventlet
Code Issues Proposed changes

wsgi: Provide python logging compatibility

Browse Source 
Provide a compatibility layer in eventlet.wsgi that allows you
to hand a python logger as the log parameter instead of a
filehandle.

If an object that looks like a python logger is passed, we use
it as expected. If not, we assume this is a fileobject that
implements the write() call, and wrap it in a compatiblity layer
that lets us user log() and debug() calls on it, including
optional *args.

https://github.com/eventlet/eventlet/pull/75
This commit is contained in:
Sean Dague
2014-01-22 20:02:44 -05:00
committed by Sergey Shepelev
parent 2b6a7cef37
commit f2aaa0dda9
1 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
eventlet/wsgi.py
View File

@@ -225,6 +225,33 @@ class HeadersTooLarge(Exception):
pass
def get_logger(log, debug):
if callable(getattr(log, 'info', None)) \
and callable(getattr(log, 'debug', None)):
return log
else:
return LoggerFileWrapper(log, debug)
class LoggerFileWrapper(object):
def __init__(self, log, debug):
self.log = log
self._debug = debug
def info(self, msg, *args, **kwargs):
self.write(msg, *args)
def debug(self, msg, *args, **kwargs):
if self._debug:
self.write(msg, *args)
def write(self, msg, *args):
msg = msg + '\n'
if args:
msg = msg % args
self.log.write(msg)
class FileObjectForHeaders(object):
def __init__(self, fp):
@@ -459,7 +486,7 @@ class HttpProtocol(BaseHTTPServer.BaseHTTPRequestHandler):
except Exception:
self.close_connection = 1
tb = traceback.format_exc()
self.server.log_message(tb)
self.server.log.info(tb)
if not headers_sent:
err_body = six.b(tb) if self.server.debug else b''
start_response("500 Internal Server Error",
@@ -485,7 +512,7 @@ class HttpProtocol(BaseHTTPServer.BaseHTTPRequestHandler):
hook(self.environ, *args, **kwargs)
if self.server.log_output:
self.server.log_message(self.server.log_format % {
self.server.log.info(self.server.log_format % {
'client_ip': self.get_client_ip(),
'client_port': self.client_address[1],
'date_time': self.log_date_time_string(),
@@ -604,9 +631,9 @@ class Server(BaseHTTPServer.HTTPServer):
self.socket = socket
self.address = address
if log:
self.log = log
self.log = get_logger(log, debug)
else:
self.log = sys.stderr
self.log = get_logger(sys.stderr, debug)
self.app = app
self.keepalive = keepalive
self.environ = environ
@@ -660,12 +687,12 @@ class Server(BaseHTTPServer.HTTPServer):
except socket.timeout:
# Expected exceptions are not exceptional
sock.close()
if self.debug:
# similar to logging "accepted" in server()
self.log_message('(%s) timed out %r' % (self.pid, address))
self.log.debug('(%s) timed out %r' % (self.pid, address))
def log_message(self, message):
self.log.write(message + '\n')
warnings.warn('server.log_message is deprecated. Please use server.log.info instead')
self.log.info(message)
try:
@@ -789,14 +816,13 @@ def server(sock, site,
if port == ':80':
port = ''
serv.log.write("(%s) wsgi starting up on %s://%s%s/\n" % (
serv.log.info("(%s) wsgi starting up on %s://%s%s/" % (
serv.pid, scheme, host, port))
while is_accepting:
try:
client_socket = sock.accept()
client_socket[0].settimeout(serv.socket_timeout)
if debug:
serv.log.write("(%s) accepted %r\n" % (
serv.log.debug("(%s) accepted %r" % (
serv.pid, client_socket[1]))
try:
pool.spawn_n(serv.process_request, client_socket)
@@ -810,11 +836,11 @@ def server(sock, site,
if support.get_errno(e) not in ACCEPT_ERRNO:
raise
except (KeyboardInterrupt, SystemExit):
serv.log.write("wsgi exiting\n")
serv.log.info("wsgi exiting")
break
finally:
pool.waitall()
serv.log.write("(%s) wsgi exited, is_accepting=%s\n" % (
serv.log.info("(%s) wsgi exited, is_accepting=%s" % (
serv.pid, is_accepting))
try:
# NOTE: It's not clear whether we want this to leave the