Update of /cvsroot/webware/Webware/WebKit
In directory usw-pr-cvs1:/tmp/cvs-serv18331
Modified Files:
ThreadedAppServer.py
Log Message:
Apply patch from Jeff Johnson for handling case where cannot bind to main listening socket.
Index: ThreadedAppServer.py
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/ThreadedAppServer.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** ThreadedAppServer.py 2001/06/27 23:05:24 1.44
--- ThreadedAppServer.py 2001/08/31 01:59:13 1.45
***************
*** 77,81 ****
self.mainsocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
addr = self.address()
! self.mainsocket.bind(addr)
print "Listening on", addr
open(self.serverSidePath('address.text'), 'w').write('%s:%d' % (addr[0], addr[1]))
--- 77,87 ----
self.mainsocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
addr = self.address()
! try:
! self.mainsocket.bind(addr)
! except:
! if self.running:
! self.initiateShutdown()
! self._closeThread.join()
! raise
print "Listening on", addr
open(self.serverSidePath('address.text'), 'w').write('%s:%d' % (addr[0], addr[1]))
|