[Python-checkins] python/dist/src/Lib/logging handlers.py,1.3,1.4

nnorwitz@users.sourceforge.net nnorwitz@users.sourceforge.net
Sun, 26 Jan 2003 08:15:26 -0800


Update of /cvsroot/python/python/dist/src/Lib/logging
In directory sc8-pr-cvs1:/tmp/cvs-serv18306/Lib/logging

Modified Files:
	handlers.py 
Log Message:
amk pointed out that syslog may use UDP or TCP sockets.
Update to try UDP, if that fails, try TCP.


Index: handlers.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/logging/handlers.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** handlers.py	26 Jan 2003 02:14:23 -0000	1.3
--- handlers.py	26 Jan 2003 16:15:24 -0000	1.4
***************
*** 350,354 ****
          if type(address) == types.StringType:
              self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
!             self.socket.connect(address)
              self.unixsocket = 1
          else:
--- 350,360 ----
          if type(address) == types.StringType:
              self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
!             # syslog may require either DGRAM or STREAM sockets
!             try:
!                 self.socket.connect(address)
!             except socket.error:
!                 self.socket.close()
!                 self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
!                 self.socket.connect(address)
              self.unixsocket = 1
          else: