fixed internal proxy references in log processor

openstack/swift

Code Issues Proposed changes

Browse Source

This commit is contained in:

John Dickinson

2010年10月08日 15:23:23 -05:00

parent 60d159fd39

commit 0235c5cd86

2 changed files with 12 additions and 19 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

25
swift/stats/log_processor.py

View File

@@ -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,

6
test/unit/stats/test_log_processor.py

View File

@@ -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