openstack/swift
Code Issues Proposed changes

changes default server_name in access log processor to match the default server name in the proxy server

Browse Source
This commit is contained in:
John Dickinson 2010-12-17 16:47:23 +00:00 committed by Tarmac
commit 1b29399896
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ class_path = swift.stats.access_processor.AccessLogProcessor
# load balancer private ips is for load balancer ip addresses that should be # load balancer private ips is for load balancer ip addresses that should be
# counted as servicenet # counted as servicenet
# lb_private_ips = # lb_private_ips =
# server_name = proxy # server_name = proxy-server
# user = swift # user = swift
# warn_percent = 0.8 # warn_percent = 0.8

2
swift/stats/access_processor.py
View File

@ -26,7 +26,7 @@ class AccessLogProcessor(object):
"""Transform proxy server access logs""" """Transform proxy server access logs"""
def __init__(self, conf): def __init__(self, conf):
self.server_name = conf.get('server_name', 'proxy') self.server_name = conf.get('server_name', 'proxy-server')
self.lb_private_ips = [x.strip() for x in \ self.lb_private_ips = [x.strip() for x in \
conf.get('lb_private_ips', '').split(',')\ conf.get('lb_private_ips', '').split(',')\
if x.strip()] if x.strip()]

2
test/unit/stats/test_log_processor.py
View File

@ -65,7 +65,7 @@ class DumbInternalProxy(object):
class TestLogProcessor(unittest.TestCase): class TestLogProcessor(unittest.TestCase):
access_test_line = 'Jul 9 04:14:30 saio proxy 1.2.3.4 4.5.6.7 '\ access_test_line = 'Jul 9 04:14:30 saio proxy-server 1.2.3.4 4.5.6.7 '\
'09/Jul/2010/04/14/30 GET '\ '09/Jul/2010/04/14/30 GET '\
'/v1/acct/foo/bar?format=json&foo HTTP/1.0 200 - '\ '/v1/acct/foo/bar?format=json&foo HTTP/1.0 200 - '\
'curl tk4e350daf-9338-4cc6-aabb-090e49babfbd '\ 'curl tk4e350daf-9338-4cc6-aabb-090e49babfbd '\