Changeset 270

Timestamp:

09/15/2010 04:37:08 PM (12 years ago)

Author:

marcus

Message:

-.added logging options to configuration

• some warnings while reading config

Location:

SHX/trunk/src/SeismicHandler

Files:

• modules/log.py (modified) (4 diffs)
• modules/runtime.py (modified) (7 diffs)
• shx.conf (modified) (2 diffs)

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

@@ -23 +23 @@
 
 from SeismicHandler.basics import Singleton
+from SeismicHandler.modules.runtime import runtime
 import logging
 import os
 import atexit
+import warnings
 
 class Logging(object):
@@ -32 +34 @@
 
     def __init__(self):
+        if not self.logging:
+            self.setup()
+
+    def setup(self):
         """configure logging once"""
 
-#        logging.Logger.__init__(self, "shx")
+        # get log level
+        level_file = runtime().config.logging.level_file[0]
+        level_screen = runtime().config.logging.level_screen[0]
 
-        if not self.logging:
-            # get temp directory for logfile
-            try:
-                # mostly set on windows
-                dir = os.environ["TEMP"]
-            except KeyError:
-                # assume linux system
-                dir = "/tmp/"
+        # get temp directory for logfile
+        try:
+            # mostly set on windows
+            directory = os.environ["TEMP"]
+        except KeyError:
+            # assume linux system
+            directory = "/tmp/"
 
-            # recent logfile depends on pid - concurrently running processes get
-            # a new logfile each
-            logfile = 'sh-%u.log' % os.getpid()
-            self.logdest = os.path.join(dir, logfile)
+        # recent logfile depends on pid - concurrently running processes get
+        # a new logfile each
+        logfile = 'sh-%u.log' % os.getpid()
+        self.logdest = os.path.join(directory, logfile)
 
-            # backup location depends on user id (just to avoid permission issues)
-            backupfile = 'shbckp-%s.log' % os.getuid()
-            self.backupdest = os.path.join(dir, backupfile)
+        # backup location depends on user id (just to avoid permission issues)
+        backupfile = 'shbckp-%s.log' % os.getuid()
+        self.backupdest = os.path.join(directory, backupfile)
 
-            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'
-                )
-            except IOError:
-                logging.warning("Cannot log to disc, path %s not writable! "
-                             "Logging everything to console." % dir)
+        try:
+            logging.basicConfig(
+                level=getattr(logging, level_file.upper()),
+                format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
+                datefmt='%Y-%m-%d %H:%M:%S',
+                filename=self.logdest,
+                filemode='w'
+            )
+        except IOError:
+            logging.warning("Cannot log to disc, path %s not writable! "
+                         "Logging everything to console." % directory)
 
-                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
-                console = logging.StreamHandler()
-                console.setLevel(logging.ERROR)
-                #console.setLevel(logging.DEBUG)
+            logging.basicConfig(
+                level=getattr(logging, level_file.upper()),
+                format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
+                datefmt='%Y-%m-%d %H:%M:%S'
+            )
+        else:
+            # additional to console
+            console = logging.StreamHandler()
+            console.setLevel(getattr(logging, level_screen.upper()))
+            #console.setLevel(logging.DEBUG)
 
-                # set a format which is simpler for console use
-                formatter = \
-                    logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s')
+            # set a format which is simpler for console use
+            formatter = \
+                logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s')
 
-                # tell the handler to use this format
-                console.setFormatter(formatter)
+            # tell the handler to use this format
+            console.setFormatter(formatter)
 
-                # add the handler to the root logger
-                logging.getLogger('').addHandler(console)
+            # add the handler to the root logger
+            logging.getLogger('').addHandler(console)
 
-            self.logging = logging
+        self.logging = logging
 
-            atexit.register(self.shutdown)
+        atexit.register(self.shutdown)
 
     def shutdown(self):
@@ -100 +107 @@
             os.rename(self.logdest, self.backupdest)
         except Exception, e:
-            pass
-#            print e
+            warnings.warn("Error while shutting down logging: %s" % e)
 
     def newLogger(self, name):
@@ -110 +116 @@
         return logging.getLogger(name)
 
-# init logging once (sets logfile, etc)
-Logging()
+if __name__ == "__main__":
+    a = Logging().newLogger("test")
+    a.info("info")
+    a.error("error")
+    a.debug("debug")

SHX/trunk/src/SeismicHandler/modules/runtime.py

@@ -22 +22 @@
 """
 
+# Please note that in this file no logging takes place since configuration
+# options for logging are initialized here first.
+
 import sys
 import os
@@ -40 +43 @@
     
     Now a file named TEST should contain
-    >>> open("TEST").read()[:34]
-    "<open file 'TEST', mode 'ab' at 0x"
+    >>> open("TEST").read() #doctest: +ELLIPSIS
+    "<open file 'TEST', mode 'ab' at 0x..."
 
     This is only for clean-up:
@@ -53 +56 @@
     
     # configuration is read from file
-    __configuration = None
+    config = None
 
     # global switches (see http://www.seismic-handler.org/portal/wiki/ShSwitch)
@@ -79 +82 @@
 
     def __init__(self):
-        if not self.__configuration:
+        if not self.config:
             self.readConfig()
 
@@ -167 +170 @@
                     # check for variable definition
                     if i[0].startswith("$"):
-                        vars[i[0].lower()] = __handlePlaceholdersVars(i[1])
+                        v = i[0].lower()
+                        if v in vars:
+                            warnings.warn("Variable '%s' defined more "
+                                          "than once!" % v, SyntaxWarning)
+
+                        vars[v] = __handlePlaceholdersVars(i[1])
                     else:
                         conf[s][i[0]] = __handlePlaceholdersVars(i[1])
 
-                # check for include statement
+                # check if include statement was defined -> process last
                 if "include" in conf[s]:
 
@@ -181 +189 @@
                         # only include current section
                         if not extra.has_section(s):
+                            warnings.warn("To be included configuration file "
+                                          "'%s' not found." % e, SyntaxWarning)
                             break
 
@@ -196 +206 @@
                 conf[s][i] = __handlePlaceholdersVars(conf[s][i], True)
                 
-        self.__configuration = conf
+        self.config = conf
         self.__fullconfig = fullconfig
 

SHX/trunk/src/SeismicHandler/shx.conf

@@ -14 +14 @@
 stations = [SHX]/stations/,[PRIVATE]/stations/,/mnt/stations/
 
+[logging]
+# possible values: debug, info, error, XXX
+level_file = debug
+level_screen = error
+
 [miniseed]
-backend = szgrf
+backend = bgrszo,sfd
+
+[bgrszo]
+host = 192.168.11.151
+db = sfdb
+use_credentials = no
+user =
+password =
+
+[sfd]
+default_path = .
 
 [graphics]
@@ -28 +43 @@
 # If the included configuration file is not found, the error will be
 # passed silently.
+
+[layout]
+# You are able to define variables. All definitions are globally no
+# matter where they are defined. Substitution will be done as last step
+# while processing the configuration file.
+$grsn = WET,FUR,BSEG
+$grf = GRA1
+read01 = MOX,$grsn,$grf