Issue 3056 - [cms] Enable threading for the test server

cms/bin/test_server.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2015 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 105 matching lines @@
 
 if __name__ == "__main__":
   if len(sys.argv) < 2:
     source = FileSource(os.curdir)
   elif os.path.isdir(sys.argv[1]):
     source = FileSource(sys.argv[1])
   else:
     sys.exit("Usage: %s [source_dir]" % sys.argv[0])
 
   try:
-    from werkzeug.serving import run_simple
+    from werkzeug.serving import ThreadedWSGIServer, run_simple
+
+    # see https://github.com/mitsuhiko/werkzeug/pull/770
+    ThreadedWSGIServer.daemon_threads = True
+
     def run(*args, **kwargs):
       # The werkzeug logger must be configured before the
       # root logger. Also we must prevent it from propagating
       # messages, otherwise messages are logged twice.
       import logging
       logger = logging.getLogger("werkzeug")
       logger.propagate = False
       logger.setLevel(logging.INFO)
       logger.addHandler(logging.StreamHandler())
 
-      run_simple(*args, **kwargs)
+      run_simple(threaded=True, *args, **kwargs)
   except ImportError:
-    from wsgiref.simple_server import make_server
+    from SocketServer import ThreadingMixIn
+    from wsgiref.simple_server import WSGIServer, make_server
+
+    class ThreadedWSGIServer(ThreadingMixIn, WSGIServer):
+      daemon_threads = True
+
     def run(host, port, app, **kwargs):
       def wrapper(environ, start_response):
         try:
           return app(environ, start_response)
         except Exception, e:
           return show_error(start_response, "500 Internal Server Error",
               uri=environ.get("PATH_INFO"), error=e)
 
-      server = make_server(host, port, wrapper)
+      server = make_server(host, port, wrapper, ThreadedWSGIServer)
       print " * Running on http://%s:%i/" % server.server_address
       server.serve_forever()
 
   run("localhost", 5000, handler, use_reloader=True, use_debugger=True)