Initial commit of middleware refactor

etc/account-server.conf-sample

@@ -1,15 +1,23 @@
-[account-server]
-# swift_dir = /etc/swift
-# devices = /srv/node
-# mount_check = true
+[DEFAULT]
+log_name = account
+# log_facility = LOG_LOCAL0
+# log_level = INFO
 # bind_ip = 0.0.0.0
 # bind_port = 6002
 # workers = 1
-# log_facility = LOG_LOCAL0
-# log_level = INFO
 # user = swift
+# swift_dir = /etc/swift
+# devices = /srv/node
+# mount_check = true
+
+[pipeline:main]
+pipeline = account-server
+
+[app:account-server]
+use = egg:swift#account
 
 [account-replicator]
+log_name = account-replicator
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # per_diff = 1000
@@ -26,6 +34,7 @@
 # reclaim_age = 86400
 
 [account-stats]
+log_name = account-stats
 # cf_account = AUTH_7abbc116-8a07-4b63-819d-02715d3e0f31
 # container_name = account_stats
 # proxy_server_conf = /etc/swift/proxy-server.conf
@@ -33,6 +42,7 @@
 # log_level = INFO
 
 [account-auditor]
+log_name = account-auditor
 # Will audit, at most, 1 account per device per interval
 # interval = 1800
 # Maximum containers randomly picked for a given account audit
@@ -43,6 +53,7 @@
 # log_level = INFO
 
 [account-reaper]
+log_name = account-reaper
 # concurrency = 25
 # interval = 3600
 # node_timeout = 10

etc/auth-server.conf-sample

@@ -1,15 +1,22 @@
-[auth-server]
-# swift_dir = /etc/swift
+[DEFAULT]
+log_name = auth
 # bind_ip = 0.0.0.0
 # bind_port = 11000
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # workers = 1
+# user = swift
+# swift_dir = /etc/swift
+# cert_file = Default is no cert; format is path like /etc/swift/auth.crt
+# key_file = Default is no key; format is path like /etc/swift/auth.key
+
+[pipeline:main]
+pipeline = auth-server
+
+[app:auth-server]
+use = egg:swift#auth
 # reseller_prefix = AUTH
 # default_cluster_url = http://127.0.0.1:9000/v1
 # token_life = 86400
 # log_headers = False
-# cert_file = Default is no cert; format is path like /etc/swift/auth.crt
-# key_file = Default is no key; format is path like /etc/swift/auth.key
 # node_timeout = 10
-user = swift

etc/container-server.conf-sample

@@ -1,19 +1,25 @@
-[container-server]
-# swift_dir = /etc/swift
-# devices = /srv/node
-# mount_check = true
+[DEFAULT]
+log_name = container
+# log_facility = LOG_LOCAL0
+# log_level = INFO
 # bind_ip = 0.0.0.0
 # bind_port = 6001
 # workers = 1
-# log_facility = LOG_LOCAL0
-# log_level = INFO
 # user = swift
+# swift_dir = /etc/swift
+# devices = /srv/node
+# mount_check = true
+
+[pipeline:main]
+pipeline = container-server
+
+[app:container-server]
+use = egg:swift#container
 # node_timeout = 3
 # conn_timeout = 0.5
 
 [container-replicator]
-# log_facility = LOG_LOCAL0
-# log_level = INFO
+log_name = container-replicator
 # per_diff = 1000
 # concurrency = 8
 # run_pause = 30
@@ -23,21 +29,19 @@
 # reclaim_age = 604800
 
 [container-updater]
+log_name = container-updater
 # interval = 300
 # concurrency = 4
 # node_timeout = 3
 # conn_timeout = 0.5
 # slowdown will sleep that amount between containers
 # slowdown = 0.01
-# log_facility = LOG_LOCAL0
-# log_level = INFO
 
 [container-auditor]
+log_name = container-auditor
 # Will audit, at most, 1 container per device per interval
 # interval = 1800
 # Maximum objects randomly picked for a given container audit
 # max_object_count = 100
 # node_timeout = 10
 # conn_timeout = 0.5
-# log_facility = LOG_LOCAL0
-# log_level = INFO

etc/object-server.conf-sample

@@ -1,24 +1,30 @@
-[object-server]
-# swift_dir = /etc/swift
-# devices = /srv/node
-# mount_check = true
+[DEFAULT]
+log_name = object
+# log_facility = LOG_LOCAL0
+# log_level = INFO
 # bind_ip = 0.0.0.0
 # bind_port = 6000
 # workers = 1
-# log_facility = LOG_LOCAL0
-# log_level = INFO
-# log_requests = True
 # user = swift
+# swift_dir = /etc/swift
+# devices = /srv/node
+# mount_check = true
+
+[pipeline:main]
+pipeline = object-server
+
+[app:object-server]
+use = egg:swift#object
+# log_requests = True
 # node_timeout = 3
 # conn_timeout = 0.5
-# network_chunk_size = 8192
-# disk_chunk_size = 32768
+# network_chunk_size = 65536
+# disk_chunk_size = 65536
 # max_upload_time = 86400
 # slow = 1
 
 [object-replicator]
-# log_facility = LOG_LOCAL0
-# log_level = INFO
+log_name = object-replicator
 # daemonize = on
 # run_pause = 30
 # concurrency = 1
@@ -28,19 +34,17 @@
 # reclaim_age = 604800
 
 [object-updater]
+log_name = object-updater
 # interval = 300
 # concurrency = 1
 # node_timeout = 10
 # conn_timeout = 0.5
 # slowdown will sleep that amount between objects
 # slowdown = 0.01
-# log_facility = LOG_LOCAL0
-# log_level = INFO
 
 [object-auditor]
+log_name = object-auditor
 # Will audit, at most, 1 object per device per interval
 # interval = 1800
 # node_timeout = 10
 # conn_timeout = 0.5
-# log_facility = LOG_LOCAL0
-# log_level = INFO

etc/proxy-server.conf-sample

@@ -1,21 +1,26 @@
-[proxy-server]
-# bind_ip = 0.0.0.0
-# bind_port = 80
-# cert_file = /etc/swift/proxy.crt
-# key_file = /etc/swift/proxy.key
-# swift_dir = /etc/swift
+[DEFAULT]
+log_name = proxy
 # log_facility = LOG_LOCAL0
 # log_level = INFO
-# log_headers = False
+# bind_ip = 0.0.0.0
+# bind_port = 80
 # workers = 1
 # user = swift
+# cert_file = /etc/swift/proxy.crt
+# key_file = /etc/swift/proxy.key
+
+[pipeline:main]
+pipeline = healthcheck cache auth proxy
+
+[app:proxy]
+use = egg:swift#proxy
+filter-with = auth
+# swift_dir = /etc/swift
+# log_headers = False
 # recheck_account_existence = 60
 # recheck_container_existence = 60
 # object_chunk_size = 8192
 # client_chunk_size = 8192
-# Default for memcache_servers is below, but you can specify multiple servers
-# with the format: 10.1.2.3:11211,10.1.2.4:11211
-# memcache_servers = 127.0.0.1:11211
 # node_timeout = 10
 # client_timeout = 60
 # conn_timeout = 0.5
@@ -31,9 +36,18 @@
 # rate_limit_account_whitelist = acct1,acct2,etc
 # rate_limit_account_blacklist = acct3,acct4,etc
 
-# [auth-server]
-# class = swift.common.auth.DevAuthMiddleware
+[filter:auth]
+use = egg:swift#auth
 # ip = 127.0.0.1
 # port = 11000
 # ssl = false
 # node_timeout = 10
+
+[filter:healthcheck]
+use = egg:swift#healthcheck
+
+[filter:cache]
+use = egg:swift#cache
+# Default for memcache_servers is below, but you can specify multiple servers
+# with the format: 10.1.2.3:11211,10.1.2.4:11211
+# memcache_servers = 127.0.0.1:11211