Reverted the pulling out of various middleware:

Code Issues Proposed changes

RateLimit
StaticWeb
TempURL/FormPOST
Change-Id: I988e93e6f4aacb817a2e354d43a04e47516fdf88

This commit is contained in:

gholt

2012年05月16日 21:08:34 +00:00

parent 3d3ed34f44

commit 1c3b75c291

18 changed files with 5497 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

89
etc/proxy-server.conf-sample

View File

@@ -21,7 +21,7 @@

# log_statsd_metric_prefix =

[pipeline:main]

pipeline = catch_errors healthcheck cache tempauth proxy-server

pipeline = catch_errors healthcheck cache ratelimit tempauth proxy-server

[app:proxy-server]

use = egg:swift#proxy

@@ -136,6 +136,38 @@ use = egg:swift#memcache

# commas, as in: 10.1.2.3:11211,10.1.2.4:11211

# memcache_servers = 127.0.0.1:11211

[filter:ratelimit]

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_level = INFO

# set log_headers = False

# clock_accuracy should represent how accurate the proxy servers' system clocks

# are with each other. 1000 means that all the proxies' clock are accurate to

# each other within 1 millisecond. No ratelimit should be higher than the

# clock accuracy.

# clock_accuracy = 1000

# max_sleep_time_seconds = 60

# log_sleep_time_seconds of 0 means disabled

# log_sleep_time_seconds = 0

# allows for slow rates (e.g. running up to 5 sec's behind) to catch up.

# rate_buffer_seconds = 5

# account_ratelimit of 0 means disabled

# account_ratelimit = 0

# these are comma separated lists of account names

# account_whitelist = a,b

# account_blacklist = c,d

# with container_limit_x = r

# for containers of size x limit requests per second to r. The container

# rate will be linearly interpolated from the values given. With the values

# below, a container of size 5 will get a rate of 75.

# container_ratelimit_0 = 100

# container_ratelimit_10 = 50

# container_ratelimit_50 = 20

[filter:catch_errors]

use = egg:swift#catch_errors

# You can override the default log routing for this filter here:

@@ -144,6 +176,61 @@ use = egg:swift#catch_errors

# set log_level = INFO

# set log_headers = False

[filter:cname_lookup]

# Note: this middleware requires python-dnspython

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_level = INFO

# set log_headers = False

# storage_domain = example.com

# lookup_depth = 1

# Note: Put staticweb just after your auth filter(s) in the pipeline

[filter:staticweb]

use = egg:swift#staticweb

# Seconds to cache container x-container-meta-web-* header values.

# cache_timeout = 300

# You can override the default log routing for this filter here:

# set log_name = staticweb

# set log_facility = LOG_LOCAL0

# set log_level = INFO

# set access_log_name = staticweb

# set access_log_facility = LOG_LOCAL0

# set access_log_level = INFO

# set log_headers = False

# Note: Put tempurl just before your auth filter(s) in the pipeline

[filter:tempurl]

use = egg:swift#tempurl

#

# The headers to remove from incoming requests. Simply a whitespace delimited

# list of header names and names can optionally end with '*' to indicate a

# prefix match. incoming_allow_headers is a list of exceptions to these

# removals.

# incoming_remove_headers = x-timestamp

#

# The headers allowed as exceptions to incoming_remove_headers. Simply a

# whitespace delimited list of header names and names can optionally end with

# '*' to indicate a prefix match.

# incoming_allow_headers =

#

# The headers to remove from outgoing responses. Simply a whitespace delimited

# list of header names and names can optionally end with '*' to indicate a

# prefix match. outgoing_allow_headers is a list of exceptions to these

# removals.

# outgoing_remove_headers = x-object-meta-*

#

# The headers allowed as exceptions to outgoing_remove_headers. Simply a

# whitespace delimited list of header names and names can optionally end with

# '*' to indicate a prefix match.

# outgoing_allow_headers = x-object-meta-public-*

# Note: Put formpost just before your auth filter(s) in the pipeline

[filter:formpost]

use = egg:swift#formpost

# Note: Just needs to be placed before the proxy-server in the pipeline.

[filter:name_check]

use = egg:swift#name_check

Reverted the pulling out of various middleware:

89 etc/proxy-server.conf-sample Unescape Escape View File

89
etc/proxy-server.conf-sample

View File