[svn] commit: r3063 - /branches/trac299/src/bin/xfrout/xfrout.py.in

[BIND 10 source code commits]

Author: chenzhengzhang
Date: Wed Sep 29 08:16:28 2010
New Revision: 3063

Log:
revert the change

Modified:
    branches/trac299/src/bin/xfrout/xfrout.py.in

Modified: branches/trac299/src/bin/xfrout/xfrout.py.in
==============================================================================
--- branches/trac299/src/bin/xfrout/xfrout.py.in (original)
+++ branches/trac299/src/bin/xfrout/xfrout.py.in Wed Sep 29 08:16:28 2010
@@ -67,17 +67,14 @@
 
 
 class XfroutSession(BaseRequestHandler):
-    def __init__(self, request, client_address, server, log, runnable):
+    def __init__(self, request, client_address, server, log):
         # The initializer for the superclass may call functions
         # that need _log to be set, so we set it first
         self._log = log
-        self._runnable = runnable
         BaseRequestHandler.__init__(self, request, client_address, server)
 
     def handle(self):
-        # Handle a request until shutdown or xfrout client is closed.
-        self._runnable = True
-        while self._runnable:
+        while True:
             fd = recv_fd(self.request.fileno())
             
             if fd < 0:
@@ -304,14 +301,13 @@
         self._lock = threading.Lock()
         self._transfers_counter = 0
         self._shutdown_event = shutdown_event
-        self._runnable = False
         self._log = log
         self.update_config_data(config_data)
         self._cc = cc
         
     def finish_request(self, request, client_address):
         '''Finish one request by instantiating RequestHandlerClass.'''
-        self.RequestHandlerClass(request, client_address, self, self._log, self._runnable)
+        self.RequestHandlerClass(request, client_address, self, self._log)
 
     def _remove_unused_sock_file(self, sock_file):
         '''Try to remove the socket file. If the file is being used 
@@ -345,7 +341,6 @@
             return True 
 
     def shutdown(self):
-        self._runnable = False
         ThreadingUnixStreamServer.shutdown(self)
         try:
             os.unlink(self._sock_file)