Merge pull request #337 from cloudfoundry/multithread-python

Modify python fixture app to be multithreaded
cloudfoundry · Oct 1, 2018 · ec57bb0 · ec57bb0
2 parents 5be910b + 86416d0
commit ec57bb0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 17 deletions.
diff --git a/assets/python/Procfile b/assets/python/Procfile
@@ -1 +1 @@
-web: python server.py $PORT
+web: python server.py
diff --git a/assets/python/runtime.txt b/assets/python/runtime.txt
@@ -0,0 +1 @@
+\r\r\n\npython-2.7.x\n\n\r\r
diff --git a/assets/python/server.py b/assets/python/server.py
@@ -1,19 +1,23 @@
-import sys
-from BaseHTTPServer import BaseHTTPRequestHandler,HTTPServer
+from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
+from SocketServer import ThreadingMixIn
+import os
 
-port = int(sys.argv[1])
-
-class requestHandler(BaseHTTPRequestHandler):
-    def do_GET(s):
-        s.send_response(200)
-        s.send_header("Content-type", "text/html")
-        s.end_headers()
-        s.wfile.write("<html>")
-        s.wfile.write("<head><title>Python app.</title></head>")
-        s.wfile.write("<body><p>python, world</p></body>")
-        s.wfile.write("</html>")
+class Handler(BaseHTTPRequestHandler):
+    def do_GET(self):
+        self.send_response(200)
+        self.end_headers()
+        message =  "Hello python, world!"
+        self.wfile.write(message)
+        self.wfile.write('\n')
         return
 
-web_server = HTTPServer(('0.0.0.0', port), requestHandler)
-print 'Started on port', port
-web_server.serve_forever()
+class ThreadedHTTPServer(ThreadingMixIn, HTTPServer):
+    """Handle requests in a separate thread."""
+
+if __name__ == '__main__':
+    port = int(os.environ.get('PORT', '8080'))
+    host = os.environ.get('VCAP_APP_HOST', '127.0.0.1')
+    print "Goin to start sever on %s:%s" % (host, port)
+    server = ThreadedHTTPServer((host, port), Handler)
+    print 'Starting server, use <Ctrl-C> to stop'
+    server.serve_forever()