tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WSGI: Get RADICALE_CONFIG from environ instead of os.environ

Browse Source
This commit is contained in:
Unrud 2018-04-29 21:45:34 +02:00
parent ad7c93628b
commit e96fa64fa6
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
radicale/__init__.py
View File

@ -952,14 +952,16 @@ class Application:
_application = None _application = None
_application_config_path = None
_application_lock = threading.Lock() _application_lock = threading.Lock()
def _init_application(config_path): def _init_application(config_path):
global _application global _application, _application_config_path
with _application_lock: with _application_lock:
if _application is not None: if _application is not None:
return return
_application_config_path = config_path
configuration = config.load([config_path] if config_path else [], configuration = config.load([config_path] if config_path else [],
ignore_missing_paths=False) ignore_missing_paths=False)
filename = os.path.expanduser(configuration.get("logging", "config")) filename = os.path.expanduser(configuration.get("logging", "config"))
@ -969,7 +971,10 @@ def _init_application(config_path):
def application(environ, start_response): def application(environ, start_response):
config_path = os.environ.get("RADICALE_CONFIG") config_path = environ.get("RADICALE_CONFIG")
if _application is None: if _application is None:
_init_application(config_path) _init_application(config_path)
if _application_config_path != config_path:
raise ValueError("RADICALE_CONFIG must not change: %s != %s" %
(repr(config_path), repr(_application_config_path)))
return _application(environ, start_response) return _application(environ, start_response)