Avii/Radicale
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

detect active default config

Browse Source
This commit is contained in:
Peter Bieringer
2024-06-07 08:35:26 +02:00
parent 28fa28aaff
commit c7c3119267
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
radicale/__init__.py
View File

@@ -53,9 +53,14 @@ def _get_application_instance(config_path: str, wsgi_errors: types.ErrorStream
config_path)) config_path))
log.set_level(cast(str, configuration.get("logging", "level"))) log.set_level(cast(str, configuration.get("logging", "level")))
# Log configuration after logger is configured # Log configuration after logger is configured
default_config_active = True
for source, miss in configuration.sources(): for source, miss in configuration.sources():
logger.info("%s %s", "Skipped missing" if miss logger.info("%s %s", "Skipped missing/unreadable" if miss
else "Loaded", source) else "Loaded", source)
if not miss and source != "default config":
default_config_active = False
if default_config_active:
logger.warn("%s", "No config file found/readable - only default config is active")
_application_instance = Application(configuration) _application_instance = Application(configuration)
if _application_config_path != config_path: if _application_config_path != config_path:
raise ValueError("RADICALE_CONFIG must not change: %r != %r" % raise ValueError("RADICALE_CONFIG must not change: %r != %r" %

8
radicale/__main__.py
View File

@@ -167,8 +167,14 @@ def run() -> None:
log.set_level(cast(str, configuration.get("logging", "level"))) log.set_level(cast(str, configuration.get("logging", "level")))
# Log configuration after logger is configured # Log configuration after logger is configured
default_config_active = True
for source, miss in configuration.sources(): for source, miss in configuration.sources():
logger.info("%s %s", "Skipped missing" if miss else "Loaded", source) logger.info("%s %s", "Skipped missing/unreadable" if miss else "Loaded", source)
if not miss and source != "default config":
default_config_active = False
if default_config_active:
logger.warn("%s", "No config file found/readable - only default config is active")
if args_ns.verify_storage: if args_ns.verify_storage:
logger.info("Verifying storage") logger.info("Verifying storage")