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

Merge pull request #608 from Unrud/config_file

Browse Source 
Fail if config file is not found
This commit is contained in:
Guillaume Ayoub 2017-05-26 11:08:12 +02:00 committed by GitHub
commit 1825c35bc7
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) group.add_argument(*args, **kwargs)
args = parser.parse_args() args = parser.parse_args()
if args.config: if args.config is not None:
configuration = config.load() configuration = config.load()
configuration_found = configuration.read(args.config) if args.config:
configuration_found = configuration.read(args.config)
else:
configuration_found = True
else: else:
configuration_paths = [ configuration_paths = [
"/etc/radicale/config", "/etc/radicale/config",
@ -101,7 +104,8 @@ def run():
# Log a warning if the configuration file of the command line is not found # Log a warning if the configuration file of the command line is not found
if not configuration_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: try:
serve(configuration, logger) serve(configuration, logger)