Skip to content

Instantly share code, notes, and snippets.

@bloodeagle40234
Created May 23, 2017 10:38
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save bloodeagle40234/45648a4adbaf57473a724856cdece014 to your computer and use it in GitHub Desktop.
Save bloodeagle40234/45648a4adbaf57473a724856cdece014 to your computer and use it in GitHub Desktop.
diff --git a/swift/proxy/server.py b/swift/proxy/server.py
index 8e6a182..1aed1f6 100644
--- a/swift/proxy/server.py
+++ b/swift/proxy/server.py
@@ -272,7 +272,11 @@ class Application(object):
"""
# the default conf will be used when looking up None or a policy that
# had no override conf
- default_conf = OverrideConf('(default)', conf, {})
+ try:
+ default_conf = OverrideConf(conf, {})
+ except ValueError as e:
+ self.logger.error("Loaded default config for %s" % e.message)
+
override_confs = defaultdict(lambda: default_conf)
# force None key to be set in the defaultdict so that it is found when
# iterating over keys
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment