diff --git a/swift/stats/log_processor.py b/swift/stats/log_processor.py index a304a878e1..1b71b61397 100644 --- a/swift/stats/log_processor.py +++ b/swift/stats/log_processor.py @@ -40,14 +40,21 @@ class LogProcessor(object): def __init__(self, conf, logger): stats_conf = conf.get('log-processor', {}) - - self._internal_proxy = None if isinstance(logger, tuple): self.logger = get_logger(*logger) else: self.logger = logger + proxy_server_conf_loc = stats_conf.get('proxy_server_conf', + '/etc/swift/proxy-server.conf') + self.proxy_server_conf = appconfig( + 'config:%s' % proxy_server_conf_loc, + name='proxy-server') + self.internal_proxy = InternalProxy(self.proxy_server_conf, + self.logger, + retries=3) + # load the processing plugins self.plugins = {} plugin_prefix = 'log-processor-' @@ -62,20 +69,6 @@ class LogProcessor(object): self.plugins[plugin_name]['instance'] = klass(plugin_conf) self.logger.debug('Loaded plugin "%s"' % plugin_name) - @property - def internal_proxy(self): - '''Lazy load internal proxy''' - if self._internal_proxy is None: - proxy_server_conf_loc = stats_conf.get('proxy_server_conf', - '/etc/swift/proxy-server.conf') - self.proxy_server_conf = appconfig( - 'config:%s' % proxy_server_conf_loc, - name='proxy-server') - self._internal_proxy = InternalProxy(self.proxy_server_conf, - self.logger, - retries=3) - return self._internal_proxy - def process_one_file(self, plugin_name, account, container, object_name): self.logger.info('Processing %s/%s/%s with plugin "%s"' % (account, container, diff --git a/test/unit/stats/test_log_processor.py b/test/unit/stats/test_log_processor.py index 4ff73eccf3..cee34e55b7 100644 --- a/test/unit/stats/test_log_processor.py +++ b/test/unit/stats/test_log_processor.py @@ -127,7 +127,7 @@ class TestLogProcessor(unittest.TestCase): def test_get_container_listing(self): p = log_processor.LogProcessor(self.proxy_config, DumbLogger()) - p._internal_proxy = DumbInternalProxy() + p.internal_proxy = DumbInternalProxy() result = p.get_container_listing('a', 'foo') expected = ['2010/03/14/13/obj1'] self.assertEquals(result, expected) @@ -148,7 +148,7 @@ class TestLogProcessor(unittest.TestCase): def test_get_object_data(self): p = log_processor.LogProcessor(self.proxy_config, DumbLogger()) - p._internal_proxy = DumbInternalProxy() + p.internal_proxy = DumbInternalProxy() result = list(p.get_object_data('a', 'c', 'o', False)) expected = ['obj','data'] self.assertEquals(result, expected) @@ -163,7 +163,7 @@ class TestLogProcessor(unittest.TestCase): 'swift.stats.stats_processor.StatsLogProcessor' }}) p = log_processor.LogProcessor(stats_proxy_config, DumbLogger()) - p._internal_proxy = DumbInternalProxy() + p.internal_proxy = DumbInternalProxy() def get_object_data(*a,**kw): return [self.stats_test_line] p.get_object_data = get_object_data

AltStyle によって変換されたページ (->オリジナル) /