openstack/swift
Code Issues Proposed changes

added some debug output

Browse Source
This commit is contained in:
John Dickinson
2010-09-15 01:55:51 -05:00
parent 8e19ef973a
commit d037c5f92e
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
etc/log-processing.conf-sample
View File

@@ -9,6 +9,7 @@ swift_account = AUTH_7abbc116-8a07-4b63-819d-02715d3e0f31
# lookback_hours = 120 # lookback_hours = 120
# lookback_window = 120 # lookback_window = 120
# user = swift # user = swift
log_name = log-processor
[log-processor-access] [log-processor-access]
# log_dir = /var/log/swift/ # log_dir = /var/log/swift/

8
swift/stats/log_processor.py
View File

@@ -197,6 +197,7 @@ class LogProcessorDaemon(Daemon):
def __init__(self, conf): def __init__(self, conf):
c = conf.get('log-processor') c = conf.get('log-processor')
super(LogProcessorDaemon, self).__init__(c) super(LogProcessorDaemon, self).__init__(c)
self.logger = get_logger(conf)
self.log_processor = LogProcessor(conf, self.logger) self.log_processor = LogProcessor(conf, self.logger)
self.lookback_hours = int(c.get('lookback_hours', '120')) self.lookback_hours = int(c.get('lookback_hours', '120'))
self.lookback_window = int(c.get('lookback_window', self.lookback_window = int(c.get('lookback_window',
@@ -222,7 +223,8 @@ class LogProcessorDaemon(Daemon):
datetime.timedelta(hours=self.lookback_hours) + \ datetime.timedelta(hours=self.lookback_hours) + \
datetime.timedelta(hours=self.lookback_window) datetime.timedelta(hours=self.lookback_window)
lookback_end = lookback_end.strftime('%Y%m%d') lookback_end = lookback_end.strftime('%Y%m%d')
self.logger.debug('lookback_start: %s' % lookback_start)
self.logger.debug('lookback_end: %s' % lookback_end)
try: try:
processed_files_stream = self.log_processor,get_object_data( processed_files_stream = self.log_processor,get_object_data(
self.log_processor_account, self.log_processor_account,
@@ -233,7 +235,7 @@ class LogProcessorDaemon(Daemon):
already_processed_files = cPickle.loads(buf) already_processed_files = cPickle.loads(buf)
except: except:
already_processed_files = set() already_processed_files = set()
self.logger.debug('found %d processed files' % len(already_processed_files))
logs_to_process = self.log_processor.get_data_list(lookback_start, logs_to_process = self.log_processor.get_data_list(lookback_start,
lookback_end, lookback_end,
already_processed_files) already_processed_files)
@@ -300,6 +302,8 @@ class LogProcessorDaemon(Daemon):
# cleanup # cleanup
s = cPickle.dumps(processed_files, cPickle.HIGHEST_PROTOCOL) s = cPickle.dumps(processed_files, cPickle.HIGHEST_PROTOCOL)
f = cStringIO.StringIO(s) f = cStringIO.StringIO(s)
self.internal_proxy.create_container(self.log_processor_account,
self.log_processor_container)
self.log_processor.internal_proxy.upload_file(s, self.log_processor.internal_proxy.upload_file(s,
self.log_processor_account, self.log_processor_account,
self.log_processor_container, self.log_processor_container,