json -> yaml

This commit is contained in:
Oleg Silkin 2020-03-31 13:59:37 -04:00
parent a6f056821f
commit 8f12d997ae
2 changed files with 2 additions and 2 deletions

View file

@ -2,6 +2,6 @@ import os
SRC_DIR = os.path.dirname(os.path.abspath(__file__)) SRC_DIR = os.path.dirname(os.path.abspath(__file__))
ROOT_DIR = os.path.dirname(SRC_DIR) ROOT_DIR = os.path.dirname(SRC_DIR)
CONFIG_FILE = os.path.join(ROOT_DIR, 'config', 'conf.json') CONFIG_FILE = os.path.join(ROOT_DIR, 'config', 'conf.yml')
LOGGING_DIR = os.path.join(ROOT_DIR, 'logs') LOGGING_DIR = os.path.join(ROOT_DIR, 'logs')
DATABASE_DIR = os.path.join(ROOT_DIR, 'database') DATABASE_DIR = os.path.join(ROOT_DIR, 'database')

View file

@ -79,7 +79,7 @@ def setup_logging_from_config(conf: dict):
def get_config(filepath): def get_config(filepath):
with open(filepath, 'r') as cfile: with open(filepath, 'r') as cfile:
config = yaml.load(cfile, Loader=yaml.FullLoader) config = yaml.load(cfile, Loader=yaml.Loader)
return config return config