From 05d1b962fc4869e2454230e11181e6bdc00c51b9 Mon Sep 17 00:00:00 2001
From: Stephen Mardson McQuay <stephen@mcquay.me>
Date: Tue, 22 Mar 2011 11:10:19 -0600
Subject: [PATCH] modified the logging to comply with what is on the
 docs.python.org page on the logging library and how it should be used

---
 interp/__init__.py       | 18 ++++++++++++++++++
 interp/baker/__init__.py |  4 +++-
 interp/grid/__init__.py  |  4 ++--
 interp/grid/simplex.py   |  1 -
 interp/tools.py          | 30 ++----------------------------
 5 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/interp/__init__.py b/interp/__init__.py
index e69de29..725f05b 100644
--- a/interp/__init__.py
+++ b/interp/__init__.py
@@ -0,0 +1,18 @@
+import logging
+import logging.handlers
+
+
+config = {
+  'filename': '/tmp/interpolatoryawesome.log',
+  'level': logging.DEBUG,
+  'size' : 1024000,
+  'backupCount': 10,
+   }
+
+logger    = logging.getLogger('interp')
+logger.setLevel(config['level'])
+my_format = logging.Formatter('%(asctime)s %(levelname)s (%(process)d) %(filename)s %(funcName)s:%(lineno)d %(message)s')
+handler   = logging.handlers.RotatingFileHandler(
+                 config['filename'], maxBytes = config['size'] * 1024, backupCount = config['backupCount'])
+handler.setFormatter(my_format)
+logger.addHandler(handler)
diff --git a/interp/baker/__init__.py b/interp/baker/__init__.py
index e45f605..4d78829 100644
--- a/interp/baker/__init__.py
+++ b/interp/baker/__init__.py
@@ -3,7 +3,9 @@ import sys
 import numpy as np
 
 import itertools
-from   interp.tools import log
+
+import logging
+log = logging.getLogger("interp")
 
 def get_phis(X, R):
   """
diff --git a/interp/grid/__init__.py b/interp/grid/__init__.py
index 6761d28..c1eba74 100644
--- a/interp/grid/__init__.py
+++ b/interp/grid/__init__.py
@@ -9,8 +9,8 @@ from scipy.spatial import KDTree
 from interp.baker import run_baker
 import interp.grid.simplex
 
-#TODO: do logging right
-from interp.tools import log
+import logging
+log = logging.getLogger("interp")
 
 class grid(object):
   def __init__(self, verts = None, q = None):
diff --git a/interp/grid/simplex.py b/interp/grid/simplex.py
index 52d7f66..0d58890 100644
--- a/interp/grid/simplex.py
+++ b/interp/grid/simplex.py
@@ -1,5 +1,4 @@
 from interp.baker import get_phis
-from interp.tools import log
 
 TOL = 1e-8
 
diff --git a/interp/tools.py b/interp/tools.py
index ff7da2d..44cd32a 100644
--- a/interp/tools.py
+++ b/interp/tools.py
@@ -1,36 +1,10 @@
 import os
 
-import logging
-import logging.handlers
-
 import inspect
 import numpy as np
 
-
-def get_logger(filename, level = logging.DEBUG, logger_name = 'interp', size = 2048, backupCount = 10):
-  """
-    This is a simple wrapper around a few sane
-    defaults using Python's logging functionality.
-
-    An explaination of the optional parameters:
-      filename    : the filename
-      level       : one of either debug, info, warn, or error
-      logger_name : if one needs multiple logfiles, one must name them.
-      size        : the size in bytes of the logfile before roll (defaults to 2MB)
-      backupCount : number of rolled logs to keep around (defaults to 10)
-  """
-
-  logger    = logging.getLogger(logger_name)
-  logger.setLevel(level)
-  my_format = logging.Formatter('%(asctime)s %(levelname)s (%(process)d) %(filename)s %(funcName)s:%(lineno)d %(message)s')
-  handler   = logging.handlers.RotatingFileHandler(
-                   filename, maxBytes = size * 1024, backupCount = backupCount)
-  handler.setFormatter(my_format)
-  logger.addHandler(handler)
-
-  return logger
-
-log = get_logger(filename = '/tmp/interp.log', level = logging.INFO, size = 10240)
+import logging
+log = logging.getLogger("interp")
 
 def rms(errors):
   """