Merge lp:~jaypipes/glance/bug736789 into lp:~glance-coresec/glance/cactus-trunk

[Jay Pipes]

Start eventlet WSGI server with a logger to avoid stdout output.

Resubmitted to depend on the lp:~jaypipes/glance/bug731304 branch and not the lp:~jaypipes/glance/bug736295 branch, since lp:~jaypipes/glance/bug731304 contains all those fixes for bug736295.

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Andrey Brindeyev (abrindeyev)]

lgtm

review: Approve

[Devin Carlen (devcamcar)]

I don't see any difference between this and the previous proposal, so still lgtm :)

review: Approve

[Andrey Brindeyev (abrindeyev)]

the same, lgtm

review: Approve

[Jay Pipes (jaypipes)]

Yeah, sorry, I rebased it on a different branch with one more bug fix in it :)

[Rick Harris (rconradharris)]

Nice, thanks Jay.

review: Approve

[OpenStack Infra (hudson-openstack)]

The prerequisite lp:~jaypipes/glance/bug731304 has not yet been merged into lp:glance.

=== modified file 'glance/common/wsgi.py'
--- glance/common/wsgi.py	2011-02-03 15:23:48 +0000
+++ glance/common/wsgi.py	2011-03-20 15:34:29 +0000
@@ -35,6 +35,17 @@
 import webob.exc
 
 
+class WritableLogger(object):
+    """A thin wrapper that responds to `write` and logs."""
+
+    def __init__(self, logger, level=logging.DEBUG):
+        self.logger = logger
+        self.level = level
+
+    def write(self, msg):
+        self.logger.log(self.level, msg.strip("\n"))
+
+
 def run_server(application, port):
     """Run a WSGI server with the given application."""
     sock = eventlet.listen(('0.0.0.0', port))
@@ -61,7 +72,9 @@
 
     def _run(self, application, socket):
         """Start a WSGI server in a new green thread."""
-        eventlet.wsgi.server(socket, application, custom_pool=self.pool)
+        logger = logging.getLogger('eventlet.wsgi.server')
+        eventlet.wsgi.server(socket, application, custom_pool=self.pool,
+                             log=WritableLogger(logger))
 
 
 class Middleware(object):