summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Andres Granados <jgranado@redhat.com>2008-02-01 19:16:08 +0100
committerJoel Andres Granados <jgranado@redhat.com>2008-02-01 19:16:08 +0100
commit89b3e6248d2e66c992f3a1affb70b05de51001b0 (patch)
treeca07c1759adc813b584167dc5ce47f0e4ab65299
parente9c3d3cb51a7753a94f926154c192fba863cc395 (diff)
downloadfirstaidkit-89b3e6248d2e66c992f3a1affb70b05de51001b0.tar.gz
firstaidkit-89b3e6248d2e66c992f3a1affb70b05de51001b0.tar.xz
firstaidkit-89b3e6248d2e66c992f3a1affb70b05de51001b0.zip
Make logging work
-rwxr-xr-xfirstaidkit2
-rw-r--r--pyfirstaidkit/__init__.py2
-rw-r--r--pyfirstaidkit/interpret.py3
-rw-r--r--pyfirstaidkit/plugins.py4
4 files changed, 6 insertions, 5 deletions
diff --git a/firstaidkit b/firstaidkit
index f89adb0..37b619c 100755
--- a/firstaidkit
+++ b/firstaidkit
@@ -22,7 +22,7 @@ from threading import Thread
from pyfirstaidkit import Tasker
from pyfirstaidkit import Config
from pyfirstaidkit import reporting
-from pyfirstaidkit import Logger
+from pyfirstaidkit import initLogger
class Flags:
print_config = False
diff --git a/pyfirstaidkit/__init__.py b/pyfirstaidkit/__init__.py
index a9a33f4..bcf3b94 100644
--- a/pyfirstaidkit/__init__.py
+++ b/pyfirstaidkit/__init__.py
@@ -17,11 +17,9 @@
from interpret import Tasker
from configuration import Config
-#from log import Logger
import logging
import sys
-Logger=None
def initLogger(config=None):
"""We want to initialize loger when we have the filename."""
Logger = logging.getLogger("firstaidkit")
diff --git a/pyfirstaidkit/interpret.py b/pyfirstaidkit/interpret.py
index a103745..0d925f8 100644
--- a/pyfirstaidkit/interpret.py
+++ b/pyfirstaidkit/interpret.py
@@ -19,7 +19,8 @@ from plugins import PluginSystem
from reporting import Reports, TASKER
import logging
import copy
-import Logger
+
+Logger=logging.getLogger("firstaidkit")
class RunDependencies(object):
"""Encapsulate flags used to control the dependencies between plugins"""
diff --git a/pyfirstaidkit/plugins.py b/pyfirstaidkit/plugins.py
index 5522fa9..4cebf6d 100644
--- a/pyfirstaidkit/plugins.py
+++ b/pyfirstaidkit/plugins.py
@@ -21,13 +21,15 @@ from errors import *
from copy import copy,deepcopy
import FirstAidKit
-import Logger
+import logging
import imp
import os
import subprocess
from cStringIO import StringIO
+Logger = logging.getLogger("firstaidkit")
+
class Flow(dict):
def __init__(self, rules, description="", *args, **kwargs):
self.description = description