Changeset 229

Timestamp:

07/20/2010 12:08:17 PM (13 years ago)

Author:

marcus

Message:

Reformatting logging module.

File:

• SHX/trunk/src/SeismicHandler/core/log.py (modified) (3 diffs)

SHX/trunk/src/SeismicHandler/core/log.py

@@ -71 +71 @@
 
             try:
-                logging.basicConfig(level=logging.DEBUG,
-                                    format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
-                                    datefmt='%Y-%m-%d %H:%M:%S',
-                                    filename=self.logdest,
-                                    filemode='w')
+                logging.basicConfig(
+                    level=logging.DEBUG,
+                    format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
+                    datefmt='%Y-%m-%d %H:%M:%S',
+                    filename=self.logdest,
+                    filemode='w'
+                )
             except IOError:
-                self.warning("Cannot log to disc, path %s not writable! Logging everything to console." % dir)
+                self.warning("Cannot log to disc, path %s not writable! "
+                             "Logging everything to console." % dir)
 
-                logging.basicConfig(level=logging.DEBUG,
-                                    format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
-                                    datefmt='%Y-%m-%d %H:%M:%S')
-
+                logging.basicConfig(
+                    level=logging.DEBUG,
+                    format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
+                    datefmt='%Y-%m-%d %H:%M:%S'
+                )
             else:
                 # additional to console
@@ -90 +94 @@
 
                 # set a format which is simpler for console use
-                formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s')
+                formatter = \
+                    logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s')
 
                 # tell the handler to use this format
@@ -112 +117 @@
         it may not be consistent!"""
 
-        # This method is called later by atexit, so we need to reimport the os
-        # module.
-        import os
-
         try:
             os.rename(self.logdest, self.backupdest)
         except Exception, e:
-            print e
+            pass
+#            print e
 
+    def newLogger(self, name):
+        """
+        Return new logger instance. It will share the basic configuration as
+        defined in __init__.
+        """
+        return logging.getLogger(name)
+
+# init logging once (sets logfile, etc)
 Logging()
-
-# clean up
-# logging must be kept since it's imported from other modules
-del os