Changeset 435

Timestamp:

08/18/2011 06:25:31 PM (11 years ago)

Author:

marcus

Message:

Logging system replies on messaging system (pubsub).

Location:

SHX/trunk/SeismicHandler

Files:

• core/__init__.py (modified) (1 diff)
• modules/log.py (modified) (3 diffs)
• modules/parse.py (modified) (1 diff)

SHX/trunk/SeismicHandler/core/__init__.py

@@ -23 +23 @@
 from SeismicHandler.modules.traces import Traces as sh_traces
 from SeismicHandler.modules.history import History as history
-from SeismicHandler.modules.log import getLogger
 
 from obspy.core import read as obspy_read

SHX/trunk/SeismicHandler/modules/log.py

@@ -24 +24 @@
 from SeismicHandler.basics import Singleton
 from SeismicHandler.config import Settings
+from SeismicHandler.utils.pubsub import pub as msgs
 
 import logging
@@ -99 +100 @@
         atexit.register(self.shutdown)
 
+        msgs.subscribe(self.receiveMessages, 'log')
+
     def shutdown(self):
         """Move our logfile to backup destination for later checking.
@@ -117 +120 @@
         return logging.getLogger(name)
 
-def getLogger(name):
-    """
-    Helper function for initializing a new logger instance.
-    """
-    return Logging().newLogger(name)
+    def receiveMessages(self, msg, topic=msgs.AUTO_TOPIC):
+        """
+        Subscribed to MessageSystem.
+        """
+        try:
+            mode = topic.getNameTuple()[1]
+        except:
+            return
+
+        try:
+            id = ".".join(topic.getNameTuple()[2:])
+        except:
+            id = "main"
+
+        l = logging.getLogger(id)
+
+        try:
+            logger = getattr(l, mode)
+            logger(msg)
+        except:
+            raise ValueError("Unknown logging mode '%s'!" % mode)
+
+# logging system is always initialized
+Logging()
 
 if __name__ == "__main__":
-    a = Logging().newLogger("test")
-    a.info("info")
-    a.error("error")
-    a.debug("debug")
+    msgs.sendMessage('log.info', msg='Log Info Message')
+    msgs.sendMessage('log.error', msg='Log Error Message')
+    msgs.sendMessage('log.debug', msg='Log Debug Message')
+    msgs.sendMessage('log.debug.traces.test',
+                                      msg='Log Debug Message in "traces.test"')

SHX/trunk/SeismicHandler/modules/parse.py

@@ -31 +31 @@
 import re
 import inspect
-import SeismicHandler.core as shcore
 import SeismicHandler.commands as commands
 from SeismicHandler.basics import AttribDict