prelude-correlator/master: Introduce a new plugin logging mechanism

commit 026a18e4b194c15fb7096f11c2252658e022c984
Author: Yoann Vandoorselaere <[email protected]>
Date:   Mon Jul 6 11:46:55 2009 +0200

    Introduce a new plugin logging mechanism


========================================

 PreludeCorrelator/pluginmanager.py   |   24 +++++++++++++++++++++++-
 PreludeCorrelator/plugins/dshield.py |    4 ++--
 2 files changed, 25 insertions(+), 3 deletions(-)

========================================

diff --git a/PreludeCorrelator/pluginmanager.py b/PreludeCorrelator/pluginmanager.py
index 8010335..4d0b7b5 100644
--- a/PreludeCorrelator/pluginmanager.py
+++ b/PreludeCorrelator/pluginmanager.py
@@ -21,7 +21,28 @@ import pkg_resources, sys, os, traceback, ConfigParser
 from PreludeCorrelator import siteconfig
 
 
-class Plugin(object):
+class PluginLog:
+    def __init__(self, env):
+        self.__logger = env.logger
+        self.__prefix = "[" + self.__class__.__name__ + "]: "
+
+    def debug(self, log):
+        self.__logger.debug(self.__prefix + log)
+
+    def info(self, log):
+        self.__logger.info(self.__prefix + log)
+
+    def warning(self, log):
+        self.__logger.warning(self.__prefix + log)
+
+    def error(self, log):
+        self.__logger.error(self.__prefix + log)
+
+    def critical(self, log):
+        self.__logger.critical(self.__prefix + log)
+
+
+class Plugin(object, PluginLog):
     enable = True
 
     def getConfigValue(self, option, default=None):
@@ -29,6 +50,7 @@ class Plugin(object):
 
     def __init__(self, env):
         self.env = env
+        PluginLog.__init__(self, env)
 
     def signal(self, signo, frame):
         pass
diff --git a/PreludeCorrelator/plugins/dshield.py b/PreludeCorrelator/plugins/dshield.py
index ba6620b..22fe9a5 100644
--- a/PreludeCorrelator/plugins/dshield.py
+++ b/PreludeCorrelator/plugins/dshield.py
@@ -59,7 +59,7 @@ class DshieldPlugin(Plugin):
         except:
             pass
 
-        self.env.logger.info("Downloading host list from dshield, this might take some time...")
+        self.info("Downloading host list, this might take some time...")
 
         con = httplib.HTTPConnection(self.__server, timeout=self.__timeout)
         con.request("GET", self.__uri)
@@ -71,7 +71,7 @@ class DshieldPlugin(Plugin):
         fd.write(r.read())
         fd.close()
 
-        self.env.logger.info("Downloading done, processing data.")
+        self.info("Downloading done, processing data.")
         self.__loadData(fname)
 
 
_______________________________________________
Prelude-cvslog site list
[email protected]
http://lists.prelude-ids.org/mailman/listinfo/prelude-cvslog