Removed some redundant code.

Added logic to check the STUPID_LOG_SEVERITY environment variable
to specify a minimum severity. The default is 0, INFO.

Added the ZPL.

lib/python/ZLogger/stupidFileLogger.py

+##############################################################################
+# 
+# Zope Public License (ZPL) Version 1.0
+# -------------------------------------
+# 
+# Copyright (c) Digital Creations.  All rights reserved.
+# 
+# This license has been certified as Open Source(tm).
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+# 1. Redistributions in source code must retain the above copyright
+#    notice, this list of conditions, and the following disclaimer.
+# 
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions, and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 
+# 3. Digital Creations requests that attribution be given to Zope
+#    in any manner possible. Zope includes a "Powered by Zope"
+#    button that is installed by default. While it is not a license
+#    violation to remove this button, it is requested that the
+#    attribution remain. A significant investment has been put
+#    into Zope, and this effort will continue if the Zope community
+#    continues to grow. This is one way to assure that growth.
+# 
+# 4. All advertising materials and documentation mentioning
+#    features derived from or use of this software must display
+#    the following acknowledgement:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    In the event that the product being advertised includes an
+#    intact Zope distribution (with copyright and license included)
+#    then this clause is waived.
+# 
+# 5. Names associated with Zope or Digital Creations must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission from Digital Creations.
+# 
+# 6. Modified redistributions of any form whatsoever must retain
+#    the following acknowledgment:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    Intact (re-)distributions of any official Zope release do not
+#    require an external acknowledgement.
+# 
+# 7. Modifications are encouraged but must be packaged separately as
+#    patches to official Zope releases.  Distributions that do not
+#    clearly separate the patches from the original work must be clearly
+#    labeled as unofficial distributions.  Modifications which do not
+#    carry the name Zope may be packaged in any form, as long as they
+#    conform to all of the clauses above.
+# 
+# 
+# Disclaimer
+# 
+#   THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
+#   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#   PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
+#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
+# 
+# 
+# This software consists of contributions made by Digital Creations and
+# many individuals on behalf of Digital Creations.  Specific
+# attributions are listed in the accompanying credits file.
+# 
+##############################################################################
 import time, sys, string, os
 
+from zLOG import severity_string, log_time, format_exception
 
 _stupid_dest=None
+_stupid_severity=None
 _no_stupid_log=[]
 format_exception_only=None
 
-
-# Standard severities
-BLATHER=-100
-INFO=0      
-PROBLEM=WARNING=100             
-ERROR=200   
-PANIC=300
-
-def severity_string(severity, mapping={
-    -100: 'BLATHER',
-    0: 'INFO',       
-    100: 'PROBLEM', 
-    200: 'ERROR',    
-    300: 'PANIC', 
-    }):
-    """Convert a severity code to a string
-    """
-    s=int(severity)
-    if mapping.has_key(s): s=mapping[s]
-    else: s=''
-    return "%s(%s)" % (s, severity)
-
-
 class stupidFileLogger:
-
     """ a stupid File Logger """
 
-
-    def __init__(self):
-        pass
-
     def __call__(self, sub, sev, sum, det, err):
         stupid_log_write(sub, sev, sum, det, err)
 
-
-
 def stupid_log_write(subsystem, severity, summary, detail, error):
-    if severity < 0: return
 
+    # Check where to log
     global _stupid_dest
     if _stupid_dest is None:
         if os.environ.has_key('STUPID_LOG_FILE'):
@@ -55,8 +111,16 @@ def stupid_log_write(subsystem, severity, summary, detail, error):
         else:
             _stupid_dest=_no_stupid_log
 
+    # Check id to log
     if _stupid_dest is _no_stupid_log: return
 
+    global _stupid_severity
+    if _stupid_severity is None:
+        try: _stupid_severity=string.atoi(os.environ['STUPID_LOG_SEVERITY'])
+        except: _stupid_severity=0
+        
+    if severity < _stupid_severity: return
+
     _stupid_dest.write(
         "------\n"
         "%s %s %s %s\n%s"
@@ -69,8 +133,6 @@ def stupid_log_write(subsystem, severity, summary, detail, error):
          )
         )
 
-
-
     _stupid_dest.flush()
 
     if error:
@@ -82,50 +144,6 @@ def stupid_log_write(subsystem, severity, summary, detail, error):
             _stupid_dest.write("%s: %s\n" % error[:2])
 
 
-def format_exception(etype,value,tb,limit=None, delimiter='\n',
-                     header='', trailer=''):
-    global format_exception_only
-    if format_exception_only is None:
-        import traceback
-        format_exception_only=traceback.format_exception_only
-
-    result=['Traceback (innermost last):']
-    if header: result.insert(0,header)
-    if limit is None:
-        if hasattr(sys, 'tracebacklimit'):
-            limit = sys.tracebacklimit
-    n = 0
-    while tb is not None and (limit is None or n < limit):
-        f = tb.tb_frame
-        lineno = tb.tb_lineno
-        co = f.f_code
-        filename = co.co_filename
-        name = co.co_name
-        locals=f.f_locals
-        result.append('  File %s, line %d, in %s'
-                      % (filename,lineno,name))
-        try: result.append('    (Object: %s)' %
-                           locals[co.co_varnames[0]].__name__)
-        except: pass
-        try: result.append('    (Info: %s)' %
-                           str(locals['__traceback_info__']))
-        except: pass
-        tb = tb.tb_next
-        n = n+1
-    result.append(string.join(format_exception_only(etype, value),
-                       ' '))
-    if trailer: result.append(trailer)
-
-    return string.join(result, delimiter)
-
-
-def log_time():
-    """Return a simple time string without spaces suitable for logging
-    """
-    return ("%4.4d-%2.2d-%2.2dT%2.2d:%2.2d:%2.2d"
-            % time.gmtime(time.time())[:6])
-
-