ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server/config: gracefully handle bad config files

Browse source
This commit is contained in:
Shyam Sunder 2020-03-13 13:17:41 -04:00
parent 0e6427d8bc
commit e3401b3993
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
server/szurubooru/config.py
View file

@ -1,9 +1,13 @@
from typing import Dict from typing import Dict
import logging
import os import os
import yaml import yaml
from szurubooru import errors from szurubooru import errors
logger = logging.getLogger(__name__)
def _merge(left: Dict, right: Dict) -> Dict: def _merge(left: Dict, right: Dict) -> Dict:
for key in right: for key in right:
if key in left: if key in left:
@ -49,13 +53,16 @@ def _docker_config() -> Dict:
def _file_config(filename: str) -> Dict: def _file_config(filename: str) -> Dict:
with open(filename) as handle: with open(filename) as handle:
return yaml.load(handle.read(), Loader=yaml.SafeLoader) return yaml.load(handle.read(), Loader=yaml.SafeLoader) or {}
def _read_config() -> Dict: def _read_config() -> Dict:
ret = _file_config('config.yaml.dist') ret = _file_config('config.yaml.dist')
if os.path.exists('config.yaml'): if os.path.isfile('config.yaml'):
ret = _merge(ret, _file_config('config.yaml')) ret = _merge(ret, _file_config('config.yaml'))
elif os.path.isdir('config.yaml'):
logger.warning(
'\'config.yaml\' should be a file, not a directory, skipping')
if os.path.exists('/.dockerenv'): if os.path.exists('/.dockerenv'):
ret = _merge(ret, _docker_config()) ret = _merge(ret, _docker_config())
return ret return ret