openstack/swift
Code Issues Proposed changes

fixed typos

Browse Source
This commit is contained in:
John Dickinson
2010-09-13 13:35:19 -05:00
parent 25c775516c
commit de70ddce11
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ swift_account = AUTH_7abbc116-8a07-4b63-819d-02715d3e0f31
# log_level = INFO # log_level = INFO
# lookback_hours = 120 # lookback_hours = 120
# lookback_window = 120 # lookback_window = 120
# user = swift
[log-processor-access] [log-processor-access]
# log_dir = /var/log/swift/ # log_dir = /var/log/swift/
@@ -21,6 +22,7 @@ class_path = swift.stats.access_processor.AccessLogProcessor
# counted as servicenet # counted as servicenet
# lb_private_ips = # lb_private_ips =
# server_name = proxy # server_name = proxy
# user = swift
[log-processor-stats] [log-processor-stats]
# log_dir = /var/log/swift/ # log_dir = /var/log/swift/
@@ -29,3 +31,4 @@ container_name = account_stats
source_filename_format = %Y%m%d%H* source_filename_format = %Y%m%d%H*
class_path = swift.stats.stats_processor.StatsLogProcessor class_path = swift.stats.stats_processor.StatsLogProcessor
# account_server_conf = /etc/swift/account-server.conf # account_server_conf = /etc/swift/account-server.conf
# user = swift

4
swift/stats/account_stats.py
View File

@@ -70,12 +70,12 @@ class AccountStat(Daemon):
if filename.endswith('.db'): if filename.endswith('.db'):
broker = AccountBroker(os.path.join(root, filename)) broker = AccountBroker(os.path.join(root, filename))
if not broker.is_deleted(): if not broker.is_deleted():
account_name, (account_name,
_, _, _, _, _, _,
container_count, container_count,
object_count, object_count,
bytes_used, bytes_used,
_, _ = broker.get_info() _, _) = broker.get_info()
line_data = '"%s",%d,%d,%d\n' % (account_name, line_data = '"%s",%d,%d,%d\n' % (account_name,
container_count, container_count,
object_count, object_count,

2
swift/stats/log_uploader.py
View File

@@ -56,7 +56,7 @@ class LogUploader(Daemon):
self.log_dir = log_dir self.log_dir = log_dir
self.swift_account = swift_account self.swift_account = swift_account
self.container_name = container_name self.container_name = container_name
self.filename_format = filename_format self.filename_format = source_filename_format
self.internal_proxy = InternalProxy(proxy_server_conf, logger) self.internal_proxy = InternalProxy(proxy_server_conf, logger)
log_name = 'swift-log-uploader-%s' % plugin_name log_name = 'swift-log-uploader-%s' % plugin_name
self.logger = utils.get_logger(uploader_conf, plugin_name) self.logger = utils.get_logger(uploader_conf, plugin_name)