diff --git a/src/config.py b/src/config.py --- a/src/config.py +++ b/src/config.py @@ -1,14 +1,44 @@ import os -import logging +import logging.config import json srcDir=os.path.dirname(__file__) -logging.basicConfig(format='%(asctime)s %(levelname)s: %(message)s', level=logging.DEBUG) with open(os.path.join(srcDir, "..", "config.json")) as f: cfgFile=json.load(f) + +logCfg = cfgFile.get("logging") or { + "version": 1, + "handlers": { + "file": { + "level": "DEBUG", + "class": "logging.FileHandler", + "filename": "/tmp/oneeye.log", + "formatter": "default" + }, + "console": { + "level": "DEBUG", + "class": "logging.StreamHandler", + "formatter": "default" + } + }, + "root": { + "handlers": ["console","file"], + "level": "DEBUG" + }, + "formatters": { + "default": { + "format": "%(asctime)s %(levelname)s: %(message)s", + "datefmt": "%Y-%m-%d %H:%M:%S" + } + } +} + +logging.config.dictConfig(logCfg) + + class misc: file=cfgFile["misc"] version=(0,0,0) @@ -17,6 +47,7 @@ class misc: _imgDir=file.get("imgDir","../images") imgDir=_imgDir if os.path.isabs(_imgDir) else os.path.join(srcDir,_imgDir) + class gui: file=cfgFile["gui"] showBigPoints=file.get("showBigPoints", False)