Merge branch 'live-request-function' into 'master'
Live request function See merge request kelder/rubygoldberg-tracker!2
This commit is contained in:
commit
1f172c3b61
1 changed files with 11 additions and 4 deletions
|
@ -38,6 +38,8 @@ def index():
|
|||
|
||||
@app.route("/start_run/<run_index>")
|
||||
def start_run(run_index):
|
||||
request_data = live_request(f'/start_run/{run_index}') #make request show up on the live requests
|
||||
|
||||
if not run_index.isdigit():
|
||||
return f'{run_index} is not a number'
|
||||
|
||||
|
@ -53,12 +55,13 @@ def start_run(run_index):
|
|||
|
||||
@app.route("/link/start/<run>/<link_index>")
|
||||
def link_start(run, link_index):
|
||||
request_data = live_request(f'/link/start/{run}/{link_index}') #make request show up on the live requests
|
||||
|
||||
if not run.isdigit() or not link_index.isdigit():
|
||||
return f'{run} and/or {link_index} is not a number'
|
||||
|
||||
start = time()
|
||||
request_data = live_request(run, link_index)
|
||||
sio.emit('live_request', request_data)
|
||||
|
||||
|
||||
if db["current_run"] != run:
|
||||
response = "Wrong run number, check that you update your run", 404
|
||||
|
@ -78,6 +81,8 @@ def link_start(run, link_index):
|
|||
|
||||
@app.route("/link/handoff/<run>/<index>")
|
||||
def link_handoff(run, index):
|
||||
request_data = live_request(f'/link/handoff/{run}/{link_index}') #make request show up on the live requests
|
||||
|
||||
if not run.isdigit() or not index.isdigit():
|
||||
return f'{run} and/or {index} is not a number'
|
||||
|
||||
|
@ -100,12 +105,14 @@ def connect(sid, data):
|
|||
sio.emit('sync_current_run', current_run, room=sid)
|
||||
|
||||
|
||||
def live_request(run, index):
|
||||
def live_request(route_data):
|
||||
ip = request.remote_addr
|
||||
request_data = {}
|
||||
request_data["hostname"] = lookup_hostname(ip)
|
||||
request_data["time"] = time()
|
||||
return request_data
|
||||
request_data["route"] = route_data
|
||||
|
||||
sio.emit('live_request', request_data)
|
||||
|
||||
|
||||
@lru_cache()
|
||||
|
|
Loading…
Reference in a new issue