Remove usage of WritableLogger from oslo_log

With Eventlet 0.17.2, we can directly pass the logger instance. This
allows us to deprecate/remove the WritableLogger class from oslo.log.

Closes-Bug: #1440773
Change-Id: I3985b30b499a1e676d39c2a6cd3a31ac13c0ab47

diff --git a/neutron/agent/linux/utils.py b/neutron/agent/linux/utils.py
index f3c8da77261fe53283373d4e9485e953d98f9685..8d78a7d6308fae3af21ea8a9bc5e24321ca49b94 100644 (file)
--- a/neutron/agent/linux/utils.py
+++ b/neutron/agent/linux/utils.py
@@ -29,7 +29,6 @@ from eventlet.green import subprocess
 from eventlet import greenthread
 from oslo_config import cfg
 from oslo_log import log as logging
-from oslo_log import loggers
 from oslo_rootwrap import client
 from oslo_utils import excutils
 import six
@@ -418,4 +417,4 @@ class UnixDomainWSGIServer(wsgi.Server):
                              application,
                              max_size=self.num_threads,
                              protocol=UnixDomainHttpProtocol,
-                             log=loggers.WritableLogger(logger))
+                             log=logger)

diff --git a/neutron/tests/unit/test_wsgi.py b/neutron/tests/unit/test_wsgi.py
index c7a403e2d8eac5300796a77c748452b69e38cf28..f70ed6300555badbb381a6f48ad54aca23d794bf 100644 (file)
--- a/neutron/tests/unit/test_wsgi.py
+++ b/neutron/tests/unit/test_wsgi.py
@@ -176,8 +176,7 @@ class TestWSGIServer(base.BaseTestCase):
         server.stop()
 
     @mock.patch.object(wsgi, 'eventlet')
-    @mock.patch.object(wsgi, 'loggers')
-    def test__run(self, logging_mock, eventlet_mock):
+    def test__run(self, eventlet_mock):
         server = wsgi.Server('test')
         server._run("app", "socket")
         eventlet_mock.wsgi.server.assert_called_once_with(
@@ -188,7 +187,6 @@ class TestWSGIServer(base.BaseTestCase):
             keepalive=CONF.wsgi_keep_alive,
             socket_timeout=server.client_socket_timeout
         )
-        self.assertTrue(len(logging_mock.mock_calls))
 
 
 class SerializerTest(base.BaseTestCase):

diff --git a/neutron/wsgi.py b/neutron/wsgi.py
index dacbadf8eafd4e5e26c4db41d855fc10c281c5a5..89d7b8340d79b2aa2dddb832d71f314b92bf15eb 100644 (file)
--- a/neutron/wsgi.py
+++ b/neutron/wsgi.py
@@ -29,7 +29,6 @@ import eventlet.wsgi
 from oslo_config import cfg
 import oslo_i18n
 from oslo_log import log as logging
-from oslo_log import loggers
 from oslo_serialization import jsonutils
 from oslo_service import service as common_service
 from oslo_service import systemd
@@ -288,7 +287,7 @@ class Server(object):
         """Start a WSGI server in a new green thread."""
         eventlet.wsgi.server(socket, application,
                              max_size=self.num_threads,
-                             log=loggers.WritableLogger(LOG),
+                             log=LOG,
                              keepalive=CONF.wsgi_keep_alive,
                              socket_timeout=self.client_socket_timeout)