Merge branch 'master' into 'client'

# Conflicts:
#   watcher/app.py
This commit is contained in:
flynn 2019-09-27 19:41:37 +02:00
commit 9a44e83637
4 changed files with 99 additions and 12 deletions

View file

@ -1,7 +1,14 @@
from time import time import asyncio
import atexit
import datetime
import socket
from functools import lru_cache
from time import sleep, time
import matplotlib.pyplot as plt
import socketio import socketio
from flask import Flask, render_template from apscheduler.schedulers.background import BackgroundScheduler
from flask import Flask, render_template, request
from flask_cors import CORS from flask_cors import CORS
sio = socketio.Server() sio = socketio.Server()
@ -20,6 +27,9 @@ app.wsgi_app = socketio.WSGIApp(sio, app.wsgi_app)
db = {"current_run": None, "run_start_timer": None, "run_data": {}} db = {"current_run": None, "run_start_timer": None, "run_data": {}}
function_times = []
function_data = []
@app.route("/") @app.route("/")
def index(): def index():
@ -38,18 +48,26 @@ def start_run(run_index):
return f'Run {run_index} started at {starttime}' return f'Run {run_index} started at {starttime}'
@app.route("/link/start/<run>/<index>") @app.route("/link/start/<run>/<link_index>")
def link_start(run, index): def link_start(run, link_index):
start = time()
request_data = live_request(run, link_index)
sio.emit('live_request', request_data)
if db["current_run"] != run: if db["current_run"] != run:
return "Wrong run number, check that you update your run", 404 response = "Wrong run number, check that you update your run", 404
else: else:
run_data = db["run_data"][run]["data"] run_data = db["run_data"][run]["data"]
if index in run_data: if link_index in run_data:
return "you already started in this run. Ignoring this request." response = "you already started in this run. Ignoring this request."
else: else:
run_data[index] = {"id": index, "start": time()} run_data[link_index] = {"id": link_index, "start": time()}
sio.emit('link_start', run_data[index]) sio.emit('link_start', run_data[link_index])
return "Success." response = "Success."
stop = time()
function_data.append(stop - start)
function_times.append(len(function_times))
return response
@app.route("/link/handoff/<run>/<index>") @app.route("/link/handoff/<run>/<index>")
@ -73,5 +91,34 @@ def connect(sid, data):
sio.emit('sync_current_run', current_run, room=sid) sio.emit('sync_current_run', current_run, room=sid)
def live_request(run, index):
ip = request.remote_addr
request_data = {}
request_data["hostname"] = lookup_hostname(ip)
request_data["time"] = time()
return request_data
@lru_cache()
def lookup_hostname(ip):
return socket.gethostbyaddr(ip)[0].split(".")[0]
# def plot_graph():
# try:
# x = function_times
# y = function_data
# plt.plot(x, y)
# plt.show()
# except:
# pass
if __name__ == '__main__': if __name__ == '__main__':
# scheduler = BackgroundScheduler()
# scheduler.add_job(func=plot_graph, trigger="interval", seconds=5)
# scheduler.start()
app.run(host="0.0.0.0", debug=True) app.run(host="0.0.0.0", debug=True)
# shut down the scheduler when exiting the app
# atexit.register(lambda: scheduler.shutdown())

View file

@ -1,3 +1,5 @@
flask flask
flask-cors flask-cors
python-socketio python-socketio
apscheduler
matplotlib

View file

@ -43,7 +43,30 @@ require(['jquery', 'socket.io'], function(jq, io) {
addLink(link_id, run_data["data"][link_id]); addLink(link_id, run_data["data"][link_id]);
} }
}); });
socket.on('live_request', function(request_data) {
console.log("live request");
request_time = new Date(request_data["time"] * 1000);
addLiveRequest(request_data["hostname"], request_time);
}); });
});
function addLiveRequest(request_host, request_time) {
let hostname = request_host;
let timesting = request_time.getHours() + ":" + request_time.getMinutes();
let html = `
<div class="item">
<div>
${hostname}
</div>
<div>
${timesting}
</div>
</div>
`;
$('#live_requests').prepend($(html));
}
function addLink(link_id, link_data) { function addLink(link_id, link_data) {
let stop = "handoff" in link_data; let stop = "handoff" in link_data;

View file

@ -64,11 +64,26 @@
</div> </div>
</div> </div>
<div class="card"> <div id="live_requests" class="card">
<div class="item">live requests</div> <div class="item">
<div>
Hostname
</div>
<div>
Time
</div>
</div>
<div class="card__title"> <div class="card__title">
Live Requests Live Requests
</div> </div>
<div class="item">
<div>
Hostname
</div>
<div>
</div>
</div>
</div> </div>
</div> </div>
</body> </body>