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

Fail if configuration is not found

Browse Source 
If a configuration file is passed with a command line argument and the file is not found, Radicale shows a warning and continues with the default configuration.
There is no reason for doing this, Radicale should just fail.

Instead, this PR allows passing an empty string like ``--config ""``. Radicale will use the default configuration in this case, without trying to load the configuration from the common paths. Previously you had to do specify a path that doesn't exist like ``--config /does/not/exist``, which looks a bit ugly and showed a warning message.
This commit is contained in:
Unrud 2017-05-24 20:49:27 +02:00
parent 22d364729b
commit d2a17c36ae
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
radicale/__main__.py
View File

@ -74,9 +74,12 @@ def run():
group.add_argument(*args, **kwargs)
args = parser.parse_args()
if args.config:
if args.config is not None:
configuration = config.load()
configuration_found = configuration.read(args.config)
if args.config:
configuration_found = configuration.read(args.config)
else:
configuration_found = True
else:
configuration_paths = [
"/etc/radicale/config",
@ -101,7 +104,8 @@ def run():
# Log a warning if the configuration file of the command line is not found
if not configuration_found:
logger.warning("Configuration file '%s' not found" % args.config)
logger.error("Configuration file '%s' not found" % args.config)
exit(1)
try:
serve(configuration, logger)