Merge "Make sure SLO's bulk-delete logger is configured"

swift/common/middleware/bulk.py

@@ -188,9 +188,9 @@ class Bulk(object):
     def __init__(self, app, conf, max_containers_per_extraction=10000,
                  max_failed_extractions=1000, max_deletes_per_request=10000,
                  max_failed_deletes=1000, yield_frequency=60, retry_count=0,
-                 retry_interval=1.5):
+                 retry_interval=1.5, logger=None):
         self.app = app
-        self.logger = get_logger(conf, log_route='bulk')
+        self.logger = logger or get_logger(conf, log_route='bulk')
         self.max_containers = max_containers_per_extraction
         self.max_failed_extractions = max_failed_extractions
         self.max_failed_deletes = max_failed_deletes

swift/common/middleware/slo.py

@@ -594,7 +594,7 @@ class StaticLargeObject(object):
             'rate_limit_after_segment', '10'))
         self.rate_limit_segments_per_sec = int(self.conf.get(
             'rate_limit_segments_per_sec', '0'))
-        self.bulk_deleter = Bulk(app, {})
+        self.bulk_deleter = Bulk(app, {}, logger=self.logger)
 
     def handle_multipart_get_or_head(self, req, start_response):
         """

test/unit/common/middleware/test_slo.py

@@ -1268,6 +1268,12 @@ class TestSloGetManifest(SloTestCase):
             ('GET', '/v1/AUTH_test/gettest/c_15')])
 
 
+class TestSloBulkLogger(unittest.TestCase):
+    def test_reused_logger(self):
+        slo_mware = slo.filter_factory({})('fake app')
+        self.assertTrue(slo_mware.logger is slo_mware.bulk_deleter.logger)
+
+
 class TestSloCopyHook(SloTestCase):
     def setUp(self):
         super(TestSloCopyHook, self).setUp()