openstack/swift
Code Issues Proposed changes

allow override new_log_cutoff

Browse Source
This commit is contained in:
David Goetz
2011-05-24 13:51:07 -07:00
parent ccba2046cb
commit 1dd4073463
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/swift-log-uploader
View File

@@ -22,6 +22,8 @@ from swift.common import utils
if __name__ == '__main__': if __name__ == '__main__':
parser = OptionParser("Usage: %prog CONFIG_FILE PLUGIN") parser = OptionParser("Usage: %prog CONFIG_FILE PLUGIN")
parser.add_option('-c', '--log_cutoff',
help='Override new_log_cutoff.')
parser.add_option('-x', '--regex', parser.add_option('-x', '--regex',
help='Override source_filename_pattern regex.') help='Override source_filename_pattern regex.')
conf_file, options = parse_options(parser=parser) conf_file, options = parse_options(parser=parser)
@@ -42,4 +44,6 @@ if __name__ == '__main__':
# currently LogUploader only supports run_once # currently LogUploader only supports run_once
options['once'] = True options['once'] = True
regex = options.get('regex') regex = options.get('regex')
uploader = LogUploader(uploader_conf, plugin, regex=regex).run(**options) cutoff = options.get('log_cutoff')
uploader = LogUploader(uploader_conf, plugin,
regex=regex, cutoff=cutoff).run(**options)

26
swift/stats/log_uploader.py
View File

@@ -54,7 +54,7 @@ class LogUploader(Daemon):
.*$ .*$
''' '''
def __init__(self, uploader_conf, plugin_name, regex=None): def __init__(self, uploader_conf, plugin_name, regex=None, cutoff=None):
super(LogUploader, self).__init__(uploader_conf) super(LogUploader, self).__init__(uploader_conf)
log_name = '%s-log-uploader' % plugin_name log_name = '%s-log-uploader' % plugin_name
self.logger = utils.get_logger(uploader_conf, log_name, self.logger = utils.get_logger(uploader_conf, log_name,
@@ -67,21 +67,19 @@ class LogUploader(Daemon):
proxy_server_conf = appconfig('config:%s' % proxy_server_conf_loc, proxy_server_conf = appconfig('config:%s' % proxy_server_conf_loc,
name='proxy-server') name='proxy-server')
self.internal_proxy = InternalProxy(proxy_server_conf) self.internal_proxy = InternalProxy(proxy_server_conf)
self.new_log_cutoff = int(uploader_conf.get('new_log_cutoff', '7200')) self.new_log_cutoff = int(cutoff or
uploader_conf.get('new_log_cutoff', '7200'))
self.unlink_log = uploader_conf.get('unlink_log', 'True').lower() in \ self.unlink_log = uploader_conf.get('unlink_log', 'True').lower() in \
utils.TRUE_VALUES utils.TRUE_VALUES
if regex: self.filename_pattern = regex or \
self.filename_pattern = regex uploader_conf.get('source_filename_pattern',
else: '''
self.filename_pattern = \ ^%s-
uploader_conf.get('source_filename_pattern', (?P<year>[0-9]{4})
''' (?P<month>[0-1][0-9])
^%s- (?P<day>[0-3][0-9])
(?P<year>[0-9]{4}) (?P<hour>[0-2][0-9])
(?P<month>[0-1][0-9]) .*$''' % plugin_name)
(?P<day>[0-3][0-9])
(?P<hour>[0-2][0-9])
.*$''' % plugin_name)
def run_once(self, *args, **kwargs): def run_once(self, *args, **kwargs):
self.logger.info(_("Uploading logs")) self.logger.info(_("Uploading logs"))