[Zope-Checkins] CVS: Zope/lib/python/ZLogger - stupidFileLogger.py:1.11

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/ZLogger
In directory cvs.zope.org:/tmp/cvs-serv17236/lib/python/ZLogger

Modified Files:
	stupidFileLogger.py 
Log Message:
      - The default "start" script now causes the event log to be sent to
        standard output unless the "EVENT_LOG_FILE" or "STUPID_LOG_FILE"
        environment variable is set.

      - The much-hated name "STUPID_LOG_FILE" now has a preferred
        alias:  "EVENT_LOG_FILE".



=== Zope/lib/python/ZLogger/stupidFileLogger.py 1.10 => 1.11 ===
     global _stupid_dest, _stupid_format
     if _stupid_dest is None:
-        if os.environ.has_key('STUPID_LOG_FILE'):
-            f=os.environ['STUPID_LOG_FILE']
+        # EVENT_LOG_FILE is the preferred environment variable, but
+        # we accept STUPID_LOG_FILE as well
+        eget = os.environ.get
+        f = eget('EVENT_LOG_FILE') or eget('STUPID_LOG_FILE')
+        if f is not None: # if the envvar exists (might still be null)
             if f: _stupid_dest=open(f,'a')
             else: _stupid_dest=sys.stderr
-        elif os.environ.get('Z_DEBUG_MODE',0):
+        elif eget('Z_DEBUG_MODE'):
             _stupid_dest=sys.stderr
         else:
             _stupid_dest=_no_stupid_log
 
-        if os.environ.has_key('STUPID_LOG_FORMAT'):
-            _stupid_format = os.environ['STUPID_LOG_FORMAT']
+        # EVENT_LOG_FORMAT is the preferred environment variable, but
+        # we accept STUPID_LOG_FORMAT as well
+        fmt = eget('EVENT_LOG_FORMAT') or eget('STUPID_LOG_FORMAT')
+
+        if fmt is not None:
+            _stupid_format = fmt
 
 
     # Check id to log
@@ -49,7 +56,11 @@
 
     global _stupid_severity
     if _stupid_severity is None:
-        try: _stupid_severity=int(os.environ['STUPID_LOG_SEVERITY'])
+        eget = os.environ.get
+        # EVENT_LOG_SEVERITY is the preferred environment variable, but
+        # we accept STUPID_LOG_SEVERITY as well
+        envvar = eget('EVENT_LOG_SEVERITY') or eget('STUPID_LOG_SEVERITY')
+        try: _stupid_severity=int(envvar)
         except: _stupid_severity=0
         
     if severity < _stupid_severity: return
@@ -67,8 +78,8 @@
         except:
             failedf, _stupid_format = _stupid_format, None
             _stupid_dest.write("------\n%s %s zLOG Format string error\n"
-                               "The STUPID_LOG_FORMAT string '%s' "
-                               "caused an error, so we won't use it.\n" %
+                               "The EVENT_LOG_FORMAT or STUPID_LOG_FORMAT"
+                               "string '%s' caused an error, it wont be used."%
                                (fmap['time'],
                                 severity_string(100),
                                 failedf)