[mousetrap/gnome3-wip: 102/240] Move logging into log.py.



commit 6af4cca59502ccd82a8f70fac411a589a6a67fd8
Author: Stoney Jackson <dr stoney gmail com>
Date:   Thu Jun 19 22:08:44 2014 -0400

    Move logging into log.py.

 src/mousetrap/gui.py                |    4 ++--
 src/mousetrap/initialize_logging.py |   24 ------------------------
 src/mousetrap/log.py                |   18 ++++++++++++++++++
 src/mousetrap/main.py               |    6 ++----
 src/mousetrap/parts/eyes.py         |    4 ++--
 5 files changed, 24 insertions(+), 32 deletions(-)
---
diff --git a/src/mousetrap/gui.py b/src/mousetrap/gui.py
index 0e22504..3728770 100644
--- a/src/mousetrap/gui.py
+++ b/src/mousetrap/gui.py
@@ -9,8 +9,8 @@ from Xlib.display import Display as XlibDisplay
 from Xlib.ext import xtest
 from Xlib import X
 
-import logging
-LOGGER = logging.getLogger(__name__)
+import mousetrap.log as log
+LOGGER = log.getLogger(__name__)
 
 class ImageWindow(object):
     def __init__(self, message):
diff --git a/src/mousetrap/log.py b/src/mousetrap/log.py
new file mode 100644
index 0000000..f815464
--- /dev/null
+++ b/src/mousetrap/log.py
@@ -0,0 +1,18 @@
+import logging
+
+
+def getLogger(name):
+    return logging.getLogger(name)
+
+
+def _initialize_mousetrap_logger():
+    app_logger = logging.getLogger('mousetrap')
+    app_logger.setLevel(logging.DEBUG)
+    handler = logging.StreamHandler()
+    handler.setLevel(logging.DEBUG)
+    formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+    handler.setFormatter(formatter)
+    app_logger.addHandler(handler)
+
+
+_initialize_mousetrap_logger()
diff --git a/src/mousetrap/main.py b/src/mousetrap/main.py
index 2f81644..c82b564 100644
--- a/src/mousetrap/main.py
+++ b/src/mousetrap/main.py
@@ -2,15 +2,13 @@
 Where it all begins.
 '''
 
-# NOTE: import this first to set up logging properly.
-import mousetrap.initialize_logging
-import logging
+import mousetrap.log as log
 from gi.repository import GObject, Gdk, Gtk
 from mousetrap.gui import Gui, Pointer
 from mousetrap.vision import Camera
 
 
-LOGGER = logging.getLogger('mousetrap.main')
+LOGGER = log.getLogger('mousetrap.main')
 
 
 #TODO: Should be a configuration file.
diff --git a/src/mousetrap/parts/eyes.py b/src/mousetrap/parts/eyes.py
index b5f302f..8e929be 100644
--- a/src/mousetrap/parts/eyes.py
+++ b/src/mousetrap/parts/eyes.py
@@ -1,9 +1,9 @@
 import mousetrap.parts.interface as interface
 from mousetrap.vision import FeatureDetector, FeatureNotFoundException
-import logging
+import mousetrap.log as log
 
 
-LOGGER = logging.getLogger(__name__)
+LOGGER = log.getLogger(__name__)
 
 
 class Part(interface.Part):


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]