diff --git a/etc/log-processor.conf-sample b/etc/log-processor.conf-sample index 716cadc..142e96f 100644 --- a/etc/log-processor.conf-sample +++ b/etc/log-processor.conf-sample @@ -34,6 +34,7 @@ class_path = slogging.access_processor.AccessLogProcessor # list of swift.sources (see swift/proxy/server.py posthooklogger) # that count as service traffic # service_log_sources = +# content_type = [log-processor-stats] # log_dir = /var/log/swift/ @@ -45,6 +46,7 @@ class_path = slogging.stats_processor.StatsLogProcessor # devices = /srv/node # mount_check = true # user = swift +# content_type = [log-processor-container-stats] # log_dir = /var/log/swift/ @@ -58,3 +60,4 @@ processable = false # mount_check = true # user = swift # metadata_keys = comma separated list of user metadata keys to be collected +# content_type = diff --git a/slogging/log_uploader.py b/slogging/log_uploader.py index f156d69..acadf19 100644 --- a/slogging/log_uploader.py +++ b/slogging/log_uploader.py @@ -81,6 +81,7 @@ class LogUploader(Daemon): (?P[0-3][0-9]) (?P[0-2][0-9]) .*$''' % plugin_name) + self.content_type = uploader_conf.get('content_type') def run_once(self, *args, **kwargs): 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. target_filename = '/'.join([year, month, day, hour, filehash + '.gz']) metadata = {'x-object-meta-original-name': filename} + if self.content_type: + metadata['Content-Type'] = self.content_type if self.internal_proxy.upload_file(filename, self.swift_account, self.container_name,