openstack/swift
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins
2014-01-21 19:31:40 +00:00
committed by Gerrit Code Review
parent 8eabb13b8f a8ba751370
commit 3d93dcb540
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
swift/common/middleware/bulk.py
View File

@@ -188,9 +188,9 @@ class Bulk(object):
def __init__(self, app, conf, max_containers_per_extraction=10000, def __init__(self, app, conf, max_containers_per_extraction=10000,
max_failed_extractions=1000, max_deletes_per_request=10000, max_failed_extractions=1000, max_deletes_per_request=10000,
max_failed_deletes=1000, yield_frequency=60, retry_count=0, max_failed_deletes=1000, yield_frequency=60, retry_count=0,
retry_interval=1.5): retry_interval=1.5, logger=None):
self.app = app 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_containers = max_containers_per_extraction
self.max_failed_extractions = max_failed_extractions self.max_failed_extractions = max_failed_extractions
self.max_failed_deletes = max_failed_deletes self.max_failed_deletes = max_failed_deletes

2
swift/common/middleware/slo.py
View File

@@ -594,7 +594,7 @@ class StaticLargeObject(object):
'rate_limit_after_segment', '10')) 'rate_limit_after_segment', '10'))
self.rate_limit_segments_per_sec = int(self.conf.get( self.rate_limit_segments_per_sec = int(self.conf.get(
'rate_limit_segments_per_sec', '0')) '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): def handle_multipart_get_or_head(self, req, start_response):
""" """

6
test/unit/common/middleware/test_slo.py
View File

@@ -1268,6 +1268,12 @@ class TestSloGetManifest(SloTestCase):
('GET', '/v1/AUTH_test/gettest/c_15')]) ('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): class TestSloCopyHook(SloTestCase):
def setUp(self): def setUp(self):
super(TestSloCopyHook, self).setUp() super(TestSloCopyHook, self).setUp()