openstack
/
glance
Code Issues Proposed changes

Remove WritableLogger from wsgi server 

Eventlet can use logger directly starting from v 0.17.2.
So we can delete usage of WritableLogger in Glance.

Closes-Bug: #1440773

Change-Id: I3f393bcdaafc96f098fe7fafd425c97211051815
This commit is contained in:
kairat_kushaev 2015-08-28 17:33:52 +03:00
parent e0243b434d
commit 06d7540e9b
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glance/common/wsgi.py
View File

@ -37,7 +37,6 @@ import glance_store
from oslo_concurrency import processutils
from oslo_config import cfg
from oslo_log import log as logging
from oslo_log import loggers
from oslo_serialization import jsonutils
import routes
import routes.middleware
@ -252,7 +251,6 @@ class Server(object):
def __init__(self, threads=1000, initialize_glance_store=False):
os.umask(0o27) # ensure files are created with the correct privileges
self._logger = logging.getLogger("eventlet.wsgi.server")
self._wsgi_logger = loggers.WritableLogger(self._logger)
self.threads = threads
self.children = set()
self.stale_children = set()
@ -454,7 +452,7 @@ class Server(object):
try:
eventlet.wsgi.server(self.sock,
self.application,
log=self._wsgi_logger,
log=self._logger,
custom_pool=self.pool,
debug=False,
keepalive=CONF.http_keepalive,
@ -472,7 +470,7 @@ class Server(object):
"""Start a WSGI server in a new green thread."""
LOG.info(_LI("Starting single process server"))
eventlet.wsgi.server(sock, application, custom_pool=self.pool,
log=self._wsgi_logger,
log=self._logger,
debug=False,
keepalive=CONF.http_keepalive,
socket_timeout=self.client_socket_timeout)

2
glance/tests/unit/common/test_wsgi.py
View File

@ -524,7 +524,7 @@ class ServerTest(test_utils.BaseTestCase):
server.wait()
mock_server.assert_called_once_with('fake_socket',
fake_application,
log=server._wsgi_logger,
log=server._logger,
debug=False,
custom_pool=server.pool,
keepalive=False,