[Zope-Checkins] CVS: Zope/lib/python/ZLogger - FileLogger.py:1.2 ZLogger.py:1.3 __init__.py:1.3 stupidFileLogger.py:1.12 syslog.py:1.5 syslogLogger.py:1.10 test_logger.py:1.3
Martijn Pieters
mj@zope.com
Wed, 14 Aug 2002 18:05:00 -0400
Update of /cvs-repository/Zope/lib/python/ZLogger
In directory cvs.zope.org:/tmp/cvs-serv19618
Modified Files:
FileLogger.py ZLogger.py __init__.py stupidFileLogger.py
syslog.py syslogLogger.py test_logger.py
Log Message:
Clean up indentation and trailing whitespace.
=== Zope/lib/python/ZLogger/FileLogger.py 1.1 => 1.2 ===
--- Zope/lib/python/ZLogger/FileLogger.py:1.1 Fri Jul 16 13:00:35 1999
+++ Zope/lib/python/ZLogger/FileLogger.py Wed Aug 14 18:04:59 2002
@@ -4,10 +4,9 @@
This is just a stub, FileLogger should be smarter than
stupidFileLogger, but for the moment it's completely brain dead.
"""
-
+
def __init__(self):
pass
def __call__(self, sub, sev, sum, det, err):
print 'syslogger %s, %s, %s, %s, %s, %s' % (self, sub, sev, sum, det, err)
-
=== Zope/lib/python/ZLogger/ZLogger.py 1.2 => 1.3 ===
--- Zope/lib/python/ZLogger/ZLogger.py:1.2 Tue May 9 07:35:09 2000
+++ Zope/lib/python/ZLogger/ZLogger.py Wed Aug 14 18:04:59 2002
@@ -1,4 +1,3 @@
-
import stupidFileLogger
import syslogLogger
=== Zope/lib/python/ZLogger/__init__.py 1.2 => 1.3 ===
--- Zope/lib/python/ZLogger/__init__.py:1.2 Wed Nov 28 10:51:18 2001
+++ Zope/lib/python/ZLogger/__init__.py Wed Aug 14 18:04:59 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
import ZLogger
=== Zope/lib/python/ZLogger/stupidFileLogger.py 1.11 => 1.12 ===
--- Zope/lib/python/ZLogger/stupidFileLogger.py:1.11 Wed Jul 3 22:31:53 2002
+++ Zope/lib/python/ZLogger/stupidFileLogger.py Wed Aug 14 18:04:59 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
import time, sys, os, thread
@@ -62,7 +62,7 @@
envvar = eget('EVENT_LOG_SEVERITY') or eget('STUPID_LOG_SEVERITY')
try: _stupid_severity=int(envvar)
except: _stupid_severity=0
-
+
if severity < _stupid_severity: return
if _stupid_format is not None:
@@ -109,9 +109,3 @@
except:
_stupid_dest.write("%s: %s\n" % error[:2])
_stupid_dest.flush()
-
-
-
-
-
-
=== Zope/lib/python/ZLogger/syslog.py 1.4 => 1.5 ===
--- Zope/lib/python/ZLogger/syslog.py:1.4 Fri May 12 15:53:47 2000
+++ Zope/lib/python/ZLogger/syslog.py Wed Aug 14 18:04:59 2002
@@ -5,9 +5,9 @@
# ======================================================================
# Copyright 1997 by Sam Rushing
-#
+#
# All Rights Reserved
-#
+#
# Permission to use, copy, modify, and distribute this software and
# its documentation for any purpose and without fee is hereby
# granted, provided that the above copyright notice appear in all
@@ -16,7 +16,7 @@
# Rushing not be used in advertising or publicity pertaining to
# distribution of the software without specific, written prior
# permission.
-#
+#
# SAM RUSHING DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
# NO EVENT SHALL SAM RUSHING BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -68,37 +68,37 @@
#
# priorities (these are ordered)
-LOG_EMERG = 0 # system is unusable
-LOG_ALERT = 1 # action must be taken immediately
-LOG_CRIT = 2 # critical conditions
-LOG_ERR = 3 # error conditions
-LOG_WARNING = 4 # warning conditions
-LOG_NOTICE = 5 # normal but significant condition
-LOG_INFO = 6 # informational
-LOG_DEBUG = 7 # debug-level messages
-
-# facility codes
-LOG_KERN = 0 # kernel messages
-LOG_USER = 1 # random user-level messages
-LOG_MAIL = 2 # mail system
-LOG_DAEMON = 3 # system daemons
-LOG_AUTH = 4 # security/authorization messages
-LOG_SYSLOG = 5 # messages generated internally by syslogd
-LOG_LPR = 6 # line printer subsystem
-LOG_NEWS = 7 # network news subsystem
-LOG_UUCP = 8 # UUCP subsystem
-LOG_CRON = 9 # clock daemon
-LOG_AUTHPRIV = 10 # security/authorization messages (private)
-
-# other codes through 15 reserved for system use
-LOG_LOCAL0 = 16 # reserved for local use
-LOG_LOCAL1 = 17 # reserved for local use
-LOG_LOCAL2 = 18 # reserved for local use
-LOG_LOCAL3 = 19 # reserved for local use
-LOG_LOCAL4 = 20 # reserved for local use
-LOG_LOCAL5 = 21 # reserved for local use
-LOG_LOCAL6 = 22 # reserved for local use
-LOG_LOCAL7 = 23 # reserved for local use
+LOG_EMERG = 0 # system is unusable
+LOG_ALERT = 1 # action must be taken immediately
+LOG_CRIT = 2 # critical conditions
+LOG_ERR = 3 # error conditions
+LOG_WARNING = 4 # warning conditions
+LOG_NOTICE = 5 # normal but significant condition
+LOG_INFO = 6 # informational
+LOG_DEBUG = 7 # debug-level messages
+
+# facility codes
+LOG_KERN = 0 # kernel messages
+LOG_USER = 1 # random user-level messages
+LOG_MAIL = 2 # mail system
+LOG_DAEMON = 3 # system daemons
+LOG_AUTH = 4 # security/authorization messages
+LOG_SYSLOG = 5 # messages generated internally by syslogd
+LOG_LPR = 6 # line printer subsystem
+LOG_NEWS = 7 # network news subsystem
+LOG_UUCP = 8 # UUCP subsystem
+LOG_CRON = 9 # clock daemon
+LOG_AUTHPRIV = 10 # security/authorization messages (private)
+
+# other codes through 15 reserved for system use
+LOG_LOCAL0 = 16 # reserved for local use
+LOG_LOCAL1 = 17 # reserved for local use
+LOG_LOCAL2 = 18 # reserved for local use
+LOG_LOCAL3 = 19 # reserved for local use
+LOG_LOCAL4 = 20 # reserved for local use
+LOG_LOCAL5 = 21 # reserved for local use
+LOG_LOCAL6 = 22 # reserved for local use
+LOG_LOCAL7 = 23 # reserved for local use
priority_names = {
"alert": LOG_ALERT,
@@ -106,11 +106,11 @@
"debug": LOG_DEBUG,
"emerg": LOG_EMERG,
"err": LOG_ERR,
- "error": LOG_ERR, # DEPRECATED
+ "error": LOG_ERR, # DEPRECATED
"info": LOG_INFO,
"notice": LOG_NOTICE,
- "panic": LOG_EMERG, # DEPRECATED
- "warn": LOG_WARNING, # DEPRECATED
+ "panic": LOG_EMERG, # DEPRECATED
+ "warn": LOG_WARNING, # DEPRECATED
"warning": LOG_WARNING,
}
@@ -123,7 +123,7 @@
"lpr": LOG_LPR,
"mail": LOG_MAIL,
"news": LOG_NEWS,
- "security": LOG_AUTH, # DEPRECATED
+ "security": LOG_AUTH, # DEPRECATED
"syslog": LOG_SYSLOG,
"user": LOG_USER,
"uucp": LOG_UUCP,
@@ -178,7 +178,7 @@
if type(facility) == type(''):
facility = facility_names[facility]
if type(priority) == type(''):
- priority = priority_names[priority]
+ priority = priority_names[priority]
return (facility<<3) | priority
def close (self):
@@ -188,7 +188,7 @@
if __name__ == '__main__':
"""
Unit test for syslog_client. Set up for the test by:
-
+
* tail -f /var/log/allstuf (to see the "normal" log messages).
* Running the test_logger.py script with a junk file name (which
@@ -210,8 +210,8 @@
import sys, traceback
if len( sys.argv ) != 2:
- print "Usage: syslog.py localSocketFilename"
- sys.exit()
+ print "Usage: syslog.py localSocketFilename"
+ sys.exit()
def test_client( desc, address=None ):
try:
=== Zope/lib/python/ZLogger/syslogLogger.py 1.9 => 1.10 ===
--- Zope/lib/python/ZLogger/syslogLogger.py:1.9 Thu Feb 7 13:02:09 2002
+++ Zope/lib/python/ZLogger/syslogLogger.py Wed Aug 14 18:04:59 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
from syslog import syslog_client, LOG_ALERT, LOG_ERR, LOG_WARNING, LOG_NOTICE
from syslog import LOG_INFO, LOG_DEBUG
=== Zope/lib/python/ZLogger/test_logger.py 1.2 => 1.3 ===
--- Zope/lib/python/ZLogger/test_logger.py:1.2 Thu May 11 20:59:21 2000
+++ Zope/lib/python/ZLogger/test_logger.py Wed Aug 14 18:04:59 2002
@@ -8,7 +8,7 @@
log_socket.bind( sys.argv[1] )
while 1:
- n = select.select( [ log_socket ], [], [] )
- print ".",
- if n > 0:
- print log_socket.recv( 1024 )
+ n = select.select( [ log_socket ], [], [] )
+ print ".",
+ if n > 0:
+ print log_socket.recv( 1024 )