Ensure LOG_LOCAL settings are consistent for swift

* Ensure all logs for specific servers go to the appropriate places
* Adjust LOG_LOCAL settings to be consistent

Fixes #550
This commit is contained in:
Andy McCrae 2014-11-17 15:46:05 +00:00
parent 833ed8eec4
commit a98e9193de
7 changed files with 29 additions and 26 deletions

View File

@ -4,6 +4,7 @@ bind_ip = {{ hostvars[inventory_hostname][repl_bridge]['ipv4']['address'] }}
bind_port = {{ swift_account_port }}
devices = {{ swift_vars.mount_point | default(swift.mount_point) }}
workers = 2
log_facility = LOG_LOCAL2
[pipeline:main]
pipeline = account-server

View File

@ -56,10 +56,10 @@ pipeline = healthcheck recon account-server
[app:account-server]
use = egg:swift#account
log_facility = LOG_LOCAL1
log_facility = LOG_LOCAL2
# You can override the default log routing for this app here:
# set log_name = account-server
# set log_facility = LOG_LOCAL0
# set log_facility = LOG_LOCAL2
# set log_level = INFO
# set log_requests = true
# set log_address = /dev/log
@ -131,7 +131,7 @@ log_facility = LOG_LOCAL2
# Will audit each account at most once per interval
# interval = 1800
#
# log_facility = LOG_LOCAL0
# log_facility = LOG_LOCAL2
# log_level = INFO
# accounts_per_second = 200
# recon_cache_path = /var/cache/swift

View File

@ -4,6 +4,7 @@ bind_ip = {{ hostvars[inventory_hostname][repl_bridge]['ipv4']['address'] }}
bind_port = {{ swift_container_port }}
devices = {{ swift_vars.mount_point | default(swift.mount_point) }}
workers = 2
log_facility = LOG_LOCAL3
[pipeline:main]
pipeline = container-server

View File

@ -62,10 +62,10 @@ pipeline = healthcheck recon container-server
[app:container-server]
use = egg:swift#container
log_facility = LOG_LOCAL1
log_facility = LOG_LOCAL3
# You can override the default log routing for this app here:
# set log_name = container-server
# set log_facility = LOG_LOCAL0
# set log_facility = LOG_LOCAL3
# set log_level = INFO
# set log_requests = true
# set log_address = /dev/log
@ -91,7 +91,7 @@ use = egg:swift#healthcheck
[filter:recon]
use = egg:swift#recon
log_facility = LOG_LOCAL2
log_facility = LOG_LOCAL3
recon_cache_path = /var/cache/swift
recon_lock_path = /var/lock/swift
@ -99,7 +99,7 @@ recon_lock_path = /var/lock/swift
[container-replicator]
# You can override the default log routing for this app here (don't use set!):
# log_name = container-replicator
log_facility = LOG_LOCAL2
log_facility = LOG_LOCAL3
# log_level = INFO
# log_address = /dev/log
#
@ -125,7 +125,7 @@ log_facility = LOG_LOCAL2
[container-updater]
# You can override the default log routing for this app here (don't use set!):
# log_name = container-updater
log_facility = LOG_LOCAL2
log_facility = LOG_LOCAL3
# log_level = INFO
# log_address = /dev/log
#
@ -145,7 +145,7 @@ conn_timeout = 5
[container-auditor]
# You can override the default log routing for this app here (don't use set!):
# log_name = container-auditor
log_facility = LOG_LOCAL2
log_facility = LOG_LOCAL3
# log_level = INFO
# log_address = /dev/log
#
@ -158,7 +158,7 @@ log_facility = LOG_LOCAL2
[container-sync]
# You can override the default log routing for this app here (don't use set!):
# log_name = container-sync
# log_facility = LOG_LOCAL0
# log_facility = LOG_LOCAL3
# log_level = INFO
# log_address = /dev/log
#

View File

@ -4,6 +4,7 @@ bind_ip = {{ hostvars[inventory_hostname][repl_bridge]['ipv4']['address'] }}
bind_port = {{ swift_object_port }}
devices = {{ swift_vars.mount_point | default(swift.mount_point) }}
workers = 2
log_facility = LOG_LOCAL4
[pipeline:main]
pipeline = object-server

View File

@ -65,10 +65,10 @@ pipeline = healthcheck recon object-server
[app:object-server]
use = egg:swift#object
log_facility = LOG_LOCAL1
log_facility = LOG_LOCAL4
# You can override the default log routing for this app here:
# set log_name = object-server
# set log_facility = LOG_LOCAL0
# set log_facility = LOG_LOCAL4
# set log_level = INFO
# set log_requests = true
# set log_address = /dev/log
@ -138,7 +138,7 @@ use = egg:swift#healthcheck
[filter:recon]
use = egg:swift#recon
log_facility = LOG_LOCAL2
log_facility = LOG_LOCAL4
recon_cache_path = /var/cache/swift
recon_lock_path = /var/lock/swift
@ -146,7 +146,7 @@ recon_lock_path = /var/lock/swift
[object-replicator]
# You can override the default log routing for this app here (don't use set!):
# log_name = object-replicator
log_facility = LOG_LOCAL2
log_facility = LOG_LOCAL4
# log_level = INFO
# log_address = /dev/log
#
@ -212,7 +212,7 @@ concurrency = 6
[object-updater]
# You can override the default log routing for this app here (don't use set!):
# log_name = object-updater
log_facility = LOG_LOCAL2
log_facility = LOG_LOCAL4
# log_level = INFO
# log_address = /dev/log
#
@ -230,7 +230,7 @@ conn_timeout = 5
[object-auditor]
# You can override the default log routing for this app here (don't use set!):
# log_name = object-auditor
log_facility = LOG_LOCAL2
log_facility = LOG_LOCAL4
# log_level = INFO
# log_address = /dev/log
#

View File

@ -83,10 +83,10 @@ pipeline = catch_errors gatekeeper healthcheck proxy-logging cache container_syn
{% endif %}
[app:proxy-server]
use = egg:swift#proxy
log_facility = LOG_LOCAL0
log_facility = LOG_LOCAL1
# You can override the default log routing for this app here:
# set log_name = proxy-server
# set log_facility = LOG_LOCAL0
# set log_facility = LOG_LOCAL1
# set log_level = INFO
# set log_address = /dev/log
#
@ -213,7 +213,7 @@ account_autocreate = true
use = egg:swift#tempauth
# You can override the default log routing for this filter here:
# set log_name = tempauth
# set log_facility = LOG_LOCAL0
# set log_facility = LOG_LOCAL1
# set log_level = INFO
# set log_headers = false
# set log_address = /dev/log
@ -307,7 +307,7 @@ use = egg:swift#healthcheck
use = egg:swift#memcache
# You can override the default log routing for this filter here:
# set log_name = cache
# set log_facility = LOG_LOCAL0
# set log_facility = LOG_LOCAL1
# set log_level = INFO
# set log_headers = false
# set log_address = /dev/log
@ -337,7 +337,7 @@ memcache_serialization_support = 2
use = egg:swift#ratelimit
# You can override the default log routing for this filter here:
# set log_name = ratelimit
# set log_facility = LOG_LOCAL0
# set log_facility = LOG_LOCAL1
# set log_level = INFO
# set log_headers = false
# set log_address = /dev/log
@ -381,7 +381,7 @@ use = egg:swift#ratelimit
use = egg:swift#domain_remap
# You can override the default log routing for this filter here:
# set log_name = domain_remap
# set log_facility = LOG_LOCAL0
# set log_facility = LOG_LOCAL1
# set log_level = INFO
# set log_headers = false
# set log_address = /dev/log
@ -394,7 +394,7 @@ use = egg:swift#domain_remap
use = egg:swift#catch_errors
# You can override the default log routing for this filter here:
# set log_name = catch_errors
# set log_facility = LOG_LOCAL0
# set log_facility = LOG_LOCAL1
# set log_level = INFO
# set log_headers = false
# set log_address = /dev/log
@ -404,7 +404,7 @@ use = egg:swift#catch_errors
use = egg:swift#cname_lookup
# You can override the default log routing for this filter here:
# set log_name = cname_lookup
# set log_facility = LOG_LOCAL0
# set log_facility = LOG_LOCAL1
# set log_level = INFO
# set log_headers = false
# set log_address = /dev/log
@ -466,7 +466,7 @@ use = egg:swift#list_endpoints
use = egg:swift#proxy_logging
# If not set, logging directives from [DEFAULT] without "access_" will be used
# access_log_name = swift
# access_log_facility = LOG_LOCAL0
# access_log_facility = LOG_LOCAL1
# access_log_level = INFO
# access_log_address = /dev/log
#
@ -573,7 +573,7 @@ use = egg:swift#account_quotas
use = egg:swift#gatekeeper
# You can override the default log routing for this filter here:
# set log_name = gatekeeper
# set log_facility = LOG_LOCAL0
# set log_facility = LOG_LOCAL1
# set log_level = INFO
# set log_headers = false
# set log_address = /dev/log