Commit 42416209 authored by 's avatar

merge from 2.3

parent 6da1e1f2
...@@ -21,11 +21,11 @@ Zope Logging ...@@ -21,11 +21,11 @@ Zope Logging
It is not very smart about it - it just dumps it to a file and the It is not very smart about it - it just dumps it to a file and the
format is not very configurable - hence the name. format is not very configurable - hence the name.
ZSYSLOG="anything" ZSYSLOG="/dev/log"
Setting this environment variable will cause Zope to try and write Setting this environment variable will cause Zope to try and write
to the '/dev/log' UNIX domain socket. This will only work on UNIX, to the named UNIX domain socket (usually '/dev/log'). This will only
and only if your syslogd domain socket is named /dev/log. work on UNIX.
ZSYSLOG_SERVER="machine.name:port" ZSYSLOG_SERVER="machine.name:port"
......
...@@ -99,7 +99,7 @@ class syslogLogger: ...@@ -99,7 +99,7 @@ class syslogLogger:
self.client = syslog_client((addr, int(port))) self.client = syslog_client((addr, int(port)))
self.on = 1 self.on = 1
elif os.environ.has_key('ZSYSLOG'): elif os.environ.has_key('ZSYSLOG'):
self.client = syslog_client() self.client = syslog_client(os.environ['ZSYSLOG'])
self.on = 1 self.on = 1
else: else:
self.on = 0 self.on = 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment