commit 55b4b54185fa30f9e9412f6cc6275a964a0b0579
author showard <showard@592f7852-d20e-0410-864c-8624ca9c26a4> Thu Jan 08 23:30:30 2009 +0000
committer showard <showard@592f7852-d20e-0410-864c-8624ca9c26a4> Thu Jan 08 23:30:30 2009 +0000
tree 7e196056035f8736a14fe25114983cb5f8945ccf
parent 4f9e53713cc2f147ab8f20b0133b2eb56e3c0d44

Make the status server smart enough to shut down cleanly when the scheduler exits.  Some of this code is taken from tcpserver/tcpcommon.py.  I'm not sure where we'd put the common code for these, or if it's too early for that.

Signed-off-by: Steve Howard <showard@google.com>



git-svn-id: http://test.kernel.org/svn/autotest/trunk@2610 592f7852-d20e-0410-864c-8624ca9c26a4

scheduler/monitor_db.py

diff --git a/scheduler/monitor_db.py b/scheduler/monitor_db.py
index fac6131..eb5d08f 100644
--- a/scheduler/monitor_db.py
+++ b/scheduler/monitor_db.py
@@ -112,6 +112,7 @@
             "Uncaught exception; terminating monitor_db")
 
     email_manager.manager.send_queued_emails()
+    server.shutdown()
     _drone_manager.shutdown()
     _db.disconnect()
 

scheduler/status_server.py

diff --git a/scheduler/status_server.py b/scheduler/status_server.py
index 2444f8d..b8832f0 100644
--- a/scheduler/status_server.py
+++ b/scheduler/status_server.py
@@ -1,4 +1,4 @@
-import os, BaseHTTPServer, cgi, threading
+import os, BaseHTTPServer, cgi, threading, urllib
 import common
 from autotest_lib.scheduler import scheduler_config
 
@@ -67,18 +67,31 @@
         self.wfile.write(_FOOTER)
 
 
-class StatusServer(object):
+class StatusServer(BaseHTTPServer.HTTPServer):
     def __init__(self):
-        self._address = ('', _PORT)
-        self._httpd = BaseHTTPServer.HTTPServer(self._address,
-                                                StatusServerRequestHandler)
+        address = ('', _PORT)
+        # HTTPServer is an old-style class :(
+        BaseHTTPServer.HTTPServer.__init__(self, address,
+                                           StatusServerRequestHandler)
+        self._shutting_down = False
 
 
-    def _run(self):
-        print 'Status server running on', self._address
-        self._httpd.serve_forever()
+    def shutdown(self):
+        if self._shutting_down:
+            return
+        print 'Shutting down server...'
+        self._shutting_down = True
+        # make one last request to awaken the server thread and make it exit
+        urllib.urlopen('http://localhost:%s' % _PORT)
+
+
+    def _serve_until_shutdown(self):
+        print 'Status server running on', self.server_address
+        while not self._shutting_down:
+            self.handle_request()
 
 
     def start(self):
-        self._thread = threading.Thread(target=self._run, name='status_server')
+        self._thread = threading.Thread(target=self._serve_until_shutdown,
+                                        name='status_server')
         self._thread.start()