Make Python sync server stoppable

sync/tools/testserver/sync_testserver.py

 #!/usr/bin/env python
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """This is a python sync server used for testing Chrome Sync.
 
 By default, it listens on an ephemeral port and xmpp_port and sends the port
 numbers back to the originating process over a pipe. The originating process can
 specify an explicit port and xmpp_port if necessary.
@@ skipping 52 matching lines @@
       except Exception:
         self.handle_error(request, client_address)
         self.close_request(request)
 
   def SetAuthenticated(self, auth_valid):
     self.authenticated = auth_valid
 
   def GetAuthenticated(self):
     return self.authenticated
 
-  def serve_forever(self):
-    """This is a merge of asyncore.loop() and SocketServer.serve_forever().
-    """
-
+  def handle_request(self):
+    """Adaptation of asyncore.loop"""
     def HandleXmppSocket(fd, socket_map, handler):
       """Runs the handler for the xmpp connection for fd.
 
       Adapted from asyncore.read() et al.
       """
 
       xmpp_connection = socket_map.get(fd)
       # This could happen if a previous handler call caused fd to get
       # removed from socket_map.
       if xmpp_connection is None:
         return
       try:
         handler(xmpp_connection)
       except (asyncore.ExitNow, KeyboardInterrupt, SystemExit):
         raise
       except:
         xmpp_connection.handle_error()
 
-    while True:
-      read_fds = [ self.fileno() ]
-      write_fds = []
-      exceptional_fds = []
+    read_fds = [ self.fileno() ]
+    write_fds = []
+    exceptional_fds = []
 
-      for fd, xmpp_connection in self._xmpp_socket_map.items():
-        is_r = xmpp_connection.readable()
-        is_w = xmpp_connection.writable()
-        if is_r:
-          read_fds.append(fd)
-        if is_w:
-          write_fds.append(fd)
-        if is_r or is_w:
-          exceptional_fds.append(fd)
+    for fd, xmpp_connection in self._xmpp_socket_map.items():
+      is_r = xmpp_connection.readable()
+      is_w = xmpp_connection.writable()
+      if is_r:
+        read_fds.append(fd)
+      if is_w:
+        write_fds.append(fd)
+      if is_r or is_w:
+        exceptional_fds.append(fd)
 
-      try:
-        read_fds, write_fds, exceptional_fds = (
-          select.select(read_fds, write_fds, exceptional_fds))
-      except select.error, err:
-        if err.args[0] != errno.EINTR:
-          raise
-        else:
-          continue
+    try:
+      read_fds, write_fds, exceptional_fds = (
+        select.select(read_fds, write_fds, exceptional_fds))
+    except select.error, err:
+      if err.args[0] != errno.EINTR:
+        raise
+      else:
+        return
 
-      for fd in read_fds:
-        if fd == self.fileno():
-          self.HandleRequestNoBlock()
-          continue
-        HandleXmppSocket(fd, self._xmpp_socket_map,
-                         asyncore.dispatcher.handle_read_event)
+    for fd in read_fds:
+      if fd == self.fileno():
+        self.HandleRequestNoBlock()
+        return
+      HandleXmppSocket(fd, self._xmpp_socket_map,
+                       asyncore.dispatcher.handle_read_event)
 
-      for fd in write_fds:
-        HandleXmppSocket(fd, self._xmpp_socket_map,
-                         asyncore.dispatcher.handle_write_event)
+    for fd in write_fds:
+      HandleXmppSocket(fd, self._xmpp_socket_map,
+                       asyncore.dispatcher.handle_write_event)
 
-      for fd in exceptional_fds:
-        HandleXmppSocket(fd, self._xmpp_socket_map,
-                         asyncore.dispatcher.handle_expt_event)
+    for fd in exceptional_fds:
+      HandleXmppSocket(fd, self._xmpp_socket_map,
+                       asyncore.dispatcher.handle_expt_event)
 
 
 class SyncPageHandler(testserver_base.BasePageHandler):
   """Handler for the main HTTP sync server."""
 
   def __init__(self, request, client_address, sync_http_server):
     get_handlers = [self.ChromiumSyncTimeHandler,
                     self.ChromiumSyncMigrationOpHandler,
                     self.ChromiumSyncCredHandler,
                     self.ChromiumSyncXmppCredHandler,
@@ skipping 414 matching lines @@
     testserver_base.TestServerRunner.add_options(self)
     self.option_parser.add_option('--xmpp-port', default='0', type='int',
                                   help='Port used by the XMPP server. If '
                                   'unspecified, the XMPP server will listen on '
                                   'an ephemeral port.')
     # Override the default logfile name used in testserver.py.
     self.option_parser.set_defaults(log_file='sync_testserver.log')
 
 if __name__ == '__main__':
   sys.exit(SyncServerRunner().main())