diff options
| author | Matthew Oliver <matt@oliver.net.au> | 2022-02-03 16:18:39 +1100 |
|---|---|---|
| committer | Alistair Coles <alistairncoles@gmail.com> | 2022-02-03 14:41:13 +0000 |
| commit | 589ac355f3ddf505983925d80b81c20107ceace0 (patch) | |
| tree | 08fdb536bc61addb5fe39ffce7edc0ce1cdb1851 /swift/proxy | |
| parent | 8ac63b760928548cd5cc1b3565ca14de3d36ce7f (diff) | |
| download | swift-589ac355f3ddf505983925d80b81c20107ceace0.tar.gz | |
Move *_swift_info functions into a new registry module
The *_swift_info functions use in module global dicts to provide a
registry mechanism for registering and getting swift info.
This is an abnormal pattern and doesn't quite fit into utils. Further
we looking at following this pattern for sensitive info to trim in the
future.
So this patch does some house cleaning and moves this registry to a new
module swift.common.registry. And updates all the references to it.
For backwards compat we still import the *_swift_info methods into utils
for any 3rd party tools or middleware.
Change-Id: I71fd7f50d1aafc001d6905438f42de4e58af8421
Diffstat (limited to 'swift/proxy')
| -rw-r--r-- | swift/proxy/controllers/info.py | 4 | ||||
| -rw-r--r-- | swift/proxy/server.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/swift/proxy/controllers/info.py b/swift/proxy/controllers/info.py index 1d148e998..05bc1a998 100644 --- a/swift/proxy/controllers/info.py +++ b/swift/proxy/controllers/info.py @@ -16,8 +16,8 @@ import json from time import time -from swift.common.utils import public, get_hmac, get_swift_info, \ - streq_const_time +from swift.common.utils import public, get_hmac, streq_const_time +from swift.common.registry import get_swift_info from swift.proxy.controllers.base import Controller, delay_denial from swift.common.swob import HTTPOk, HTTPForbidden, HTTPUnauthorized diff --git a/swift/proxy/server.py b/swift/proxy/server.py index 1e1388c41..547410213 100644 --- a/swift/proxy/server.py +++ b/swift/proxy/server.py @@ -34,8 +34,9 @@ from swift.common.ring import Ring from swift.common.utils import Watchdog, get_logger, \ get_remote_client, split_path, config_true_value, generate_trans_id, \ affinity_key_function, affinity_locality_predicate, list_from_csv, \ - register_swift_info, parse_prefixed_conf, config_auto_int_value, \ + parse_prefixed_conf, config_auto_int_value, \ config_request_node_count_value, config_percent_value +from swift.common.registry import register_swift_info from swift.common.constraints import check_utf8, valid_api_version from swift.proxy.controllers import AccountController, ContainerController, \ ObjectControllerRouter, InfoController |