From 2c7dfbe849025ea9ccbd18660abc12454f4e1388 Mon Sep 17 00:00:00 2001 From: John Dickinson Date: Tue, 21 Dec 2010 17:09:32 -0600 Subject: [PATCH] fixes variable name collision --- swift/stats/access_processor.py | 6 ++++-- swift/stats/stats_processor.py | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/swift/stats/access_processor.py b/swift/stats/access_processor.py index 0f5814076f..b7e475833f 100644 --- a/swift/stats/access_processor.py +++ b/swift/stats/access_processor.py @@ -127,7 +127,8 @@ class AccessLogProcessor(object): d['code'] = int(d['code']) return d - def process(self, obj_stream, account, container, object_name): + def process(self, obj_stream, data_object_account, data_object_container, + data_object_name): '''generate hourly groupings of data from one access log file''' hourly_aggr_info = {} total_lines = 0 @@ -191,7 +192,8 @@ class AccessLogProcessor(object): hourly_aggr_info[aggr_key] = d if bad_lines > (total_lines * self.warn_percent): - name = '/'.join([account, container, object_name]) + name = '/'.join([data_object_account, data_object_container, + data_object_name]) self.logger.warning('I found a bunch of bad lines in %s '\ '(%d bad, %d total)' % (name, bad_lines, total_lines)) return hourly_aggr_info diff --git a/swift/stats/stats_processor.py b/swift/stats/stats_processor.py index 6caaae7840..a590a74108 100644 --- a/swift/stats/stats_processor.py +++ b/swift/stats/stats_processor.py @@ -22,10 +22,11 @@ class StatsLogProcessor(object): def __init__(self, conf): self.logger = get_logger(conf) - def process(self, obj_stream, account, container, object_name): + def process(self, obj_stream, data_object_account, data_object_container, + data_object_name): '''generate hourly groupings of data from one stats log file''' account_totals = {} - year, month, day, hour, _ = object_name.split('/') + year, month, day, hour, _ = data_object_name.split('/') for line in obj_stream: if not line: continue