From 6d58ed6283d5c7e93d9c6b882f7975a2d59ccbcd Mon Sep 17 00:00:00 2001
From: Julian Rother <julianr@fsmpi.rwth-aachen.de>
Date: Fri, 29 Dec 2017 04:23:20 +0100
Subject: [PATCH] Incorporated worker_ping into jobs_schedule endpoint
---
jobs.py | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/jobs.py b/jobs.py
index 23fc2ed..c984f7c 100644
--- a/jobs.py
+++ b/jobs.py
@@ -90,12 +90,6 @@ def jobs_catch_broken():
except:
pass
-@app.route('/internal/jobs/api/worker/<hostname>/ping', methods=['GET', 'POST'])
-@jobs_api_token_required
-def jobs_worker_ping(hostname):
- query('REPLACE INTO worker (hostname, last_ping) values (?, ?)', hostname, datetime.now())
- return 'OK',200
-
@app.route('/internal/jobs/api/job/<int:id>/ping', methods=['GET', 'POST'])
@jobs_api_token_required
def jobs_ping(id):
@@ -117,6 +111,7 @@ def jobs_ping(id):
@app.route('/internal/jobs/api/worker/<hostname>/schedule', methods=['POST'])
@jobs_api_token_required
def jobs_schedule(hostname):
+ query('REPLACE INTO worker (hostname, last_ping) values (?, ?)', hostname, datetime.now())
hostdata = request.get_json()
if not hostdata:
return 'no hostdata sent', 400
--
GitLab