Fix webservice

We're using the WSGIServer from gevent in order to integrate websockets easily, but that server is not talking fcgi. Luckily we could skip lighttpd altogether using the generic webservice type on the Tool Labs grid engine.
danmichaelo · Jan 7, 2018 · 7ef65ba · 7ef65ba
1 parent 3ab18f6
commit 7ef65ba
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 35 deletions.
diff --git a/.lighttpd.conf b/.lighttpd.conf
diff --git a/server.sh b/server.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
+export APP_BASE_HREF=https://tools.wmflabs.org/ukbot/
 . ENV/bin/activate
 python -m src.server
diff --git a/service.manifest b/service.manifest
@@ -0,0 +1,6 @@
+# This file is used by toollabs infrastructure.
+# Please do not edit manually at this time.
+backend: gridengine
+version: 2
+web: generic
+web::extra_args: /data/project/ukbot/server.sh
diff --git a/src/server.py b/src/server.py
@@ -2,7 +2,6 @@
 import os, sys
 sys.path.insert(0, '/data/project/ukbot/ENV/lib/python3.4/site-packages')
 
-from flipflop import WSGIServer
 from .webinterface.app import app
 
 import logging
@@ -24,8 +23,14 @@
 #app.debug = True  # reload on each code change
 
 if __name__ == '__main__':
-    from gevent import pywsgi
+    from gevent import pywsgi, socket
     from geventwebsocket.handler import WebSocketHandler
-    server = pywsgi.WSGIServer(('', 5000), app, handler_class=WebSocketHandler)
+
+    PORT=int(os.environ.get('PORT'))  # Tool Forge tells us what port we can use
+    listener = ('', PORT)
+
+    server = pywsgi.WSGIServer(listener, app, handler_class=WebSocketHandler)
     server.serve_forever()
 
+
+
diff --git a/src/webinterface/app.py b/src/webinterface/app.py
@@ -67,7 +67,7 @@ def db_cursor():
     db.close()
 
 
-app = Flask(__name__)
+app = Flask(__name__, static_url_path='/ukbot/static')
 sockets = Sockets(app)
 
 def error_404():
@@ -88,7 +88,7 @@ def read_status(fname):
         stat = '<em>Failed</em>'
     return stat
 
-@app.route('/')
+@app.route('/ukbot/')
 def show_index():
 
     cf = copy(contests)
@@ -122,15 +122,15 @@ def show_index():
 #         )
 
 
-@app.route('/<contest>/status')
+@app.route('/ukbot/<contest>/status')
 def show_uk_log(contest):
     if contest not in [c['id'] for c in contests]:
         return error_404()
 
     return render_template('status.html', base_href=base_href, contest=contest)
 
 
-@sockets.route('/<contest>/status.sock')
+@sockets.route('/ukbot/<contest>/status.sock')
 def show_contest_status_sock(socket, contest):
     if contest not in [c['id'] for c in contests]:
         return error_404()
@@ -205,7 +205,7 @@ def validate(data):
     return page, errors
 
 
-@app.route('/wordcount')
+@app.route('/ukbot/wordcount')
 def show_wordcount():
     lang = request.args.get('lang', '')
     page = request.args.get('page', '')

diff --git a/src/webinterface/templates/layout.html b/src/webinterface/templates/layout.html
@@ -18,7 +18,7 @@
 <body>
     <div class="container">
         <h1>
-            <a href="/">UKB</a>
+            <a href="./">UKB</a>
             @ Toolforge
         </h1>
 

diff --git a/src/webinterface/templates/main.html b/src/webinterface/templates/main.html
@@ -13,7 +13,7 @@
 <section style="clear:both;">
   <img src="static/plots/{{ conf.id }}.mem.png" style="width:400px; float:right;">
   <h2>
-      <a href="./{{ conf.url }}/">{{ conf.name }}</a>
+      <a href="{{ conf.url }}/">{{ conf.name }}</a>
   </h2>
   <a href="./{{ conf.id }}/status">{{ conf.status | safe }}</a>
 </section>

diff --git a/src/webinterface/templates/status.html b/src/webinterface/templates/status.html
@@ -8,24 +8,17 @@
 
 <script>
 
-var baseHref = document.getElementsByTagName('base')[0].href.replace(/https?:/, 'ws:');
+var baseHref = document.getElementsByTagName('base')[0].href.replace(/https?:/, 'wss:');
 var contest = "{{contest}}";
 
 var socket = new WebSocket(baseHref + contest + "/status.sock");
 socket.onopen = function(){
     console.log("Socket has been opened!");
-    socket.send('Hello');
-    // setInterval(function() {
-    //     socket.send('ping');
-    // }, 1000);
-
 }
 socket.onmessage = function(msg){
     $('#run_log').text( $('#run_log').text() + msg.data);
     console.log(msg); //Awesome!
 }
-
-
 </script>
 
 {% endblock %}