From 5021cae297967ceb60947e611ef98b31b7c01ffd Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Mon, 9 Nov 2009 19:30:23 -0500
Subject: [PATCH] Clean up logging changes.

---
 pyfpdb/Configuration.py        |  7 +++----
 pyfpdb/Database.py             |  2 --
 pyfpdb/HandHistoryConverter.py | 11 ++---------
 pyfpdb/fpdb_import.py          | 10 +---------
 4 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index c6e38c01..a8bf79a6 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -84,13 +84,13 @@ def get_config(file_name, fallback = True):
             sys.exit()
     return file_name
 
-def get_logger(file_name, fallback = False):
+def get_logger(file_name, config = "config", fallback = False):
     conf = get_config(file_name, fallback = fallback)
     if conf:
         try:
             logging.config.fileConfig(conf)
-            log = logging.getLogger("config")
-            log.debug("config logger initialised")
+            log = logging.getLogger(config)
+            log.debug("%s logger initialised" % config)
             return log
         except:
             pass
@@ -102,7 +102,6 @@ def get_logger(file_name, fallback = False):
 
 #    find a logging.conf file and set up logging
 log = get_logger("logging.conf")
-log.error("FARTS")
 
 ########################################################################
 # application wide consts
diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 0f811537..0314d78d 100755
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -46,8 +46,6 @@ import Tourney
 from Exceptions import *
 
 log = Configuration.get_logger("logging.conf")
-log.error("TURDS")
-
 
 class Database:
 
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index bced9d93..197e361a 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -32,19 +32,12 @@ from xml.dom.minidom import Node
 import time
 import datetime
 from Exceptions import FpdbParseError
+import Configuration
 
 import gettext
 gettext.install('fpdb')
 
-import logging, logging.config
-import ConfigParser
-
-try:
-    logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf"))
-except ConfigParser.NoSectionError: # debian package path
-    logging.config.fileConfig('/usr/share/python-fpdb/logging.conf')
-
-log = logging.getLogger("parser")
+log = Configuration.get_logger("logging.conf")
 
 import pygtk
 import gtk
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index fcad30be..850f34b6 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -42,15 +42,7 @@ import fpdb_parse_logic
 import Configuration
 import Exceptions
 
-import logging, logging.config
-import ConfigParser
-
-try:
-    logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf"))
-except ConfigParser.NoSectionError: # debian package path
-    logging.config.fileConfig('/usr/share/python-fpdb/logging.conf')
-
-log = logging.getLogger('importer')
+log = Configuration.get_logger("logging.conf", "importer")
 
 #    database interface modules
 try: