x/slogging
Code Issues Proposed changes

added content_type config for uploaded logs

Browse Source
This commit is contained in:
John Dickinson 2012-05-15 10:17:54 -05:00
parent 9dac908f55
commit 2b74f59798
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/log-processor.conf-sample
View File

@ -34,6 +34,7 @@ class_path = slogging.access_processor.AccessLogProcessor
# list of swift.sources (see swift/proxy/server.py posthooklogger) # list of swift.sources (see swift/proxy/server.py posthooklogger)
# that count as service traffic # that count as service traffic
# service_log_sources = # service_log_sources =
# content_type =
[log-processor-stats] [log-processor-stats]
# log_dir = /var/log/swift/ # log_dir = /var/log/swift/
@ -45,6 +46,7 @@ class_path = slogging.stats_processor.StatsLogProcessor
# devices = /srv/node # devices = /srv/node
# mount_check = true # mount_check = true
# user = swift # user = swift
# content_type =
[log-processor-container-stats] [log-processor-container-stats]
# log_dir = /var/log/swift/ # log_dir = /var/log/swift/
@ -58,3 +60,4 @@ processable = false
# mount_check = true # mount_check = true
# user = swift # user = swift
# metadata_keys = comma separated list of user metadata keys to be collected # metadata_keys = comma separated list of user metadata keys to be collected
# content_type =

3
slogging/log_uploader.py
View File

@ -81,6 +81,7 @@ class LogUploader(Daemon):
(?P<day>[0-3][0-9]) (?P<day>[0-3][0-9])
(?P<hour>[0-2][0-9]) (?P<hour>[0-2][0-9])
.*$''' % plugin_name) .*$''' % plugin_name)
self.content_type = uploader_conf.get('content_type')
def run_once(self, *args, **kwargs): def run_once(self, *args, **kwargs):
self.logger.info(_("Uploading logs")) self.logger.info(_("Uploading logs"))
@ -185,6 +186,8 @@ class LogUploader(Daemon):
# more than one time. By using md5, we get an etag for free. # more than one time. By using md5, we get an etag for free.
target_filename = '/'.join([year, month, day, hour, filehash + '.gz']) target_filename = '/'.join([year, month, day, hour, filehash + '.gz'])
metadata = {'x-object-meta-original-name': filename} metadata = {'x-object-meta-original-name': filename}
if self.content_type:
metadata['Content-Type'] = self.content_type
if self.internal_proxy.upload_file(filename, if self.internal_proxy.upload_file(filename,
self.swift_account, self.swift_account,
self.container_name, self.container_name,