[Zope-Checkins] CVS: Zope2 - z2.py:1.54

andreas@serenade.digicool.com andreas@serenade.digicool.com
Mon, 18 Jun 2001 09:49:32 -0400


Update of /cvs-repository/Zope2
In directory serenade:/tmp/cvs-serv15427

Modified Files:
	z2.py 
Log Message:
Collector #2316: introduced env. var ZSYSLOG_FACILITY to 
override the default syslog facility "user"



--- Updated File z2.py in package Zope2 --
--- z2.py	2001/04/30 16:03:46	1.53
+++ z2.py	2001/06/18 13:49:01	1.54
@@ -604,6 +604,10 @@
         lg = logger.file_logger('-') # log to stdout
     elif os.environ.has_key('ZSYSLOG'):
         lg = logger.syslog_logger(os.environ['ZSYSLOG'])
+        if os.environ.has_key("ZSYSLOG_FACILITY"):
+            lg = logger.syslog_logger(os.environ['ZSYSLOG'],facility=os.environ['ZSYSLOG_FACILITY'])
+        else:
+            lg = logger.syslog_logger(os.environ['ZSYSLOG'])
     elif os.environ.has_key('ZSYSLOG_SERVER'):
         (addr, port) = string.split(os.environ['ZSYSLOG_SERVER'], ':')
         lg = logger.syslog_logger((addr, int(port)))