diff --git a/setup.py b/setup.py index d6427ef..66d0818 100644 --- a/setup.py +++ b/setup.py @@ -17,6 +17,7 @@ setup( # Linux: mesa-libGL-devel ; @"C Development Tools and Libraries" # nb: WebEngine seems to be broken in 5.10.1 :-/ "PyQT5==5.10.0", + "pyyaml==3.13", "click==6.7", ], extras_require = { diff --git a/vasl_templates/webapp/__init__.py b/vasl_templates/webapp/__init__.py index 09e3aeb..9746ef8 100644 --- a/vasl_templates/webapp/__init__.py +++ b/vasl_templates/webapp/__init__.py @@ -2,10 +2,11 @@ import os import configparser -import json import logging +import logging.config from flask import Flask +import yaml from vasl_templates.webapp.config.constants import APP_NAME, BASE_DIR @@ -34,10 +35,13 @@ if os.path.isfile( _fname ) : load_debug_config( _fname ) # initialize logging -_fname = os.path.join( config_dir, "logging.cfg" ) +_fname = os.path.join( config_dir, "logging.yaml" ) if os.path.isfile( _fname ): - import logging.config - logging.config.dictConfig( json.load( open(_fname,"r") ) ) + with open( _fname, "r" ) as fp: + logging.config.dictConfig( yaml.safe_load( fp ) ) +else: + # stop Flask from logging every request :-/ + logging.getLogger( "werkzeug" ).setLevel( logging.WARNING ) # load the application import vasl_templates.webapp.main #pylint: disable=cyclic-import diff --git a/vasl_templates/webapp/config/.gitignore b/vasl_templates/webapp/config/.gitignore index 4261f66..b6c6cde 100644 --- a/vasl_templates/webapp/config/.gitignore +++ b/vasl_templates/webapp/config/.gitignore @@ -1,2 +1,2 @@ debug.cfg -logging.cfg +logging.yaml