diff --git a/etc/log-processing.conf-sample b/etc/log-processing.conf-sample index 97d33c15d3..433613efee 100644 --- a/etc/log-processing.conf-sample +++ b/etc/log-processing.conf-sample @@ -8,6 +8,7 @@ swift_account = AUTH_7abbc116-8a07-4b63-819d-02715d3e0f31 # log_level = INFO # lookback_hours = 120 # lookback_window = 120 +# user = swift [log-processor-access] # log_dir = /var/log/swift/ @@ -21,6 +22,7 @@ class_path = swift.stats.access_processor.AccessLogProcessor # counted as servicenet # lb_private_ips = # server_name = proxy +# user = swift [log-processor-stats] # log_dir = /var/log/swift/ @@ -29,3 +31,4 @@ container_name = account_stats source_filename_format = %Y%m%d%H* class_path = swift.stats.stats_processor.StatsLogProcessor # account_server_conf = /etc/swift/account-server.conf +# user = swift \ No newline at end of file diff --git a/swift/stats/account_stats.py b/swift/stats/account_stats.py index 60b7bbf684..b436a5b12c 100644 --- a/swift/stats/account_stats.py +++ b/swift/stats/account_stats.py @@ -70,12 +70,12 @@ class AccountStat(Daemon): if filename.endswith('.db'): broker = AccountBroker(os.path.join(root, filename)) if not broker.is_deleted(): - account_name, + (account_name, _, _, _, container_count, object_count, bytes_used, - _, _ = broker.get_info() + _, _) = broker.get_info() line_data = '"%s",%d,%d,%d\n' % (account_name, container_count, object_count, diff --git a/swift/stats/log_uploader.py b/swift/stats/log_uploader.py index 6385574860..579f1901ab 100644 --- a/swift/stats/log_uploader.py +++ b/swift/stats/log_uploader.py @@ -56,7 +56,7 @@ class LogUploader(Daemon): self.log_dir = log_dir self.swift_account = swift_account self.container_name = container_name - self.filename_format = filename_format + self.filename_format = source_filename_format self.internal_proxy = InternalProxy(proxy_server_conf, logger) log_name = 'swift-log-uploader-%s' % plugin_name self.logger = utils.get_logger(uploader_conf, plugin_name)

AltStyle によって変換されたページ (->オリジナル) /