From 93a04d6fa2c3a90e2ca971f9660b5408a7bbdd54 Mon Sep 17 00:00:00 2001
From: Andreas <andreasv@fsmpi.rwth-aachen.de>
Date: Wed, 12 Apr 2017 01:36:39 +0200
Subject: [PATCH] removed "finished" endpoint in jobs and added functionality
to ping
---
jobs.py | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/jobs.py b/jobs.py
index 909aab3..41d0c46 100644
--- a/jobs.py
+++ b/jobs.py
@@ -59,17 +59,10 @@ def jobs_ping(id):
hostname = request.values['host']
status = json.dumps(request.values['status'], default=date_json_handler)
state = request.values['state']
- query('UPDATE jobs SET worker = ?, last_ping = ?, status = ?, state = ? where id = ?', hostname, datetime.now(), status, state, id)
- return 'OK',200
-
-@app.route('/jobs/api/job/<int:id>/finished', methods=['GET', 'POST'])
-@jobs_api_token_required
-def jobs_finished(id):
- if 'status' in request.values:
- status = request.values['status']
+ if state == 'finished':
+ query('UPDATE jobs SET time_finished = ?, status = ?, state = "finished" where id = ?', datetime.now(), status, id)
else:
- status = json.dumps(request.get_json()['status'], default=date_json_handler)
- query('UPDATE jobs SET time_finished = ?, status = ?, state = "finished" where id = ?', datetime.now(), status, id)
+ query('UPDATE jobs SET worker = ?, last_ping = ?, status = ?, state = ? where id = ?', hostname, datetime.now(), status, state, id)
return 'OK',200
@app.route('/jobs/api/worker/<hostname>/schedule', methods=['POST'])
--
GitLab