openstack/swift
Code Issues Proposed changes

Merge "Log deprecation warnings for account_white/blacklist"

Browse Source
This commit is contained in:
Zuul
2018-05-23 02:15:37 +00:00
committed by Gerrit Code Review
parent c3574d06bb 87cc550332
commit 3bd2ec5eed
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
swift/common/middleware/ratelimit.py
View File

@@ -109,9 +109,19 @@ class RateLimitMiddleware(object):
self.ratelimit_whitelist = \
[acc.strip() for acc in
conf.get('account_whitelist', '').split(',') if acc.strip()]
if self.ratelimit_whitelist:
self.logger.warning('Option account_whitelist is deprecated. Use '
'an internal client to POST a `X-Account-'
'Sysmeta-Global-Write-Ratelimit: WHITELIST` '
'header to the specific accounts instead.')
self.ratelimit_blacklist = \
[acc.strip() for acc in
conf.get('account_blacklist', '').split(',') if acc.strip()]
if self.ratelimit_blacklist:
self.logger.warning('Option account_blacklist is deprecated. Use '
'an internal client to POST a `X-Account-'
'Sysmeta-Global-Write-Ratelimit: BLACKLIST` '
'header to the specific accounts instead.')
self.container_ratelimits = interpret_conf_limits(
conf, 'container_ratelimit_')
self.container_listing_ratelimits = interpret_conf_limits(