[wpdev-commits] xmlscripts/scripts webadmin.py,1.11,1.12

[<dar...@us...>]

Update of /cvsroot/wpdev/xmlscripts/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv24041

Modified Files:
	webadmin.py 
Log Message:
This should fix the annoying webadmin startup problems.

Index: webadmin.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/webadmin.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** webadmin.py	8 Oct 2003 01:42:07 -0000	1.11
--- webadmin.py	8 Oct 2003 01:47:41 -0000	1.12
***************
*** 20,23 ****
--- 20,24 ----
  import web.sessions
  import wolfpack
+ import wolfpack.console
  
  # Just override handle_error for nicer error handling
***************
*** 230,259 ****
  
      def cancel( self ):
! 	self.stopped.set()
! 	self.httpd.server_close()
  
      def run( self ):
! 	# Wait with binding the webserver for 5 Seconds
! 	server_address = ( '', self.port )
! 	time.sleep( 5 )	
! 
! 	# Starting up
! 	print "Remote Admin running on port %u\n" % self.port
  
! 	try:
! 	    filepath = os.path.normpath( os.path.abspath( 'web/' ) )
! 	    self.httpd = Webserver( ( '', self.port ), filepath )
! 	except:
! 	    traceback.print_exc()
! 	    return
  
! 	while 1:
! 	    self.httpd.handle_request()
  
! 	    self.stopped.wait( 0.05 )
! 	    if self.stopped.isSet():
! 		break
  
! 	print "Shutting down the Remote Admin.\n"
  
  thread = None
--- 231,260 ----
  
      def cancel( self ):
!       self.stopped.set()
!       self.httpd.server_close()
  
      def run( self ):
!       # Wait with binding the webserver for 5 Seconds
!       server_address = ( '', self.port )
  
!       # Starting up
!       if not wolfpack.isreloading():
!             wolfpack.console.send( "Remote Admin running on port %u\n" % self.port )
  
!       try:
!             filepath = os.path.normpath( os.path.abspath( 'web/' ) )
!             self.httpd = Webserver( ( '', self.port ), filepath )
!       except:
!             traceback.print_exc()
!             return
  
!       while 1:
!             self.httpd.handle_request()
!             self.stopped.wait( 0.05 )
!             
!             if self.stopped.isSet():
!                   break
  
!       wolfpack.console.send( "Shutting down the Remote Admin.\n" )
  
  thread = None