diff --git a/src/analyzer/__init__.py b/src/analyzer/__init__.py --- a/src/analyzer/__init__.py +++ b/src/analyzer/__init__.py @@ -1,8 +1,10 @@ -import logging as log +import logging from .grid import Grid from util import BLACK,WHITE,EMPTY, exportBoard +log=logging.getLogger(__name__) + class ImageAnalyzer: def __init__(self,tresB=30,tresW=60): 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) diff --git a/src/core.py b/src/core.py --- a/src/core.py +++ b/src/core.py @@ -1,7 +1,7 @@ import os import multiprocessing import threading -import logging as log +import logging import PIL from util import MsgQueue from gui import gui @@ -10,6 +10,8 @@ from go.core import Go, isLegalPosition from statebag import StateBag import config as cfg +log=logging.getLogger(__name__) + class Core: def __init__(self): diff --git a/src/go/core.py b/src/go/core.py --- a/src/go/core.py +++ b/src/go/core.py @@ -1,9 +1,10 @@ -import logging as log +import logging from util import EMPTY,BLACK,WHITE, colorNames,hashBoard,diffHash from .helperboard import HelperBoard from .gamerecord import GameRecord +log=logging.getLogger(__name__) PASS=(99,99) diff --git a/src/gui/imgview.py b/src/gui/imgview.py --- a/src/gui/imgview.py +++ b/src/gui/imgview.py @@ -1,4 +1,4 @@ -import logging as log +import logging from PIL import ImageTk @@ -9,6 +9,8 @@ from analyzer.epoint import EPoint from analyzer.grid import Grid import analyzer +log=logging.getLogger(__name__) + class ImgView(ResizableCanvas): def __init__(self,master=None,parent=None): diff --git a/src/util.py b/src/util.py --- a/src/util.py +++ b/src/util.py @@ -1,7 +1,8 @@ import random import multiprocessing -import logging as log +import logging +log=logging.getLogger(__name__) EMPTY=0 BLACK=1