jobs: Update API

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 1abe4d19ea894e94321e2079d18f86bad4ef5e29..f8cfef6997e846201bfd8e4fc0e490081fbb357f 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -181,8 +181,7 @@ class Application(tornado.web.Application):
                        (r"/jobs/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/retry", jobs.RetryHandler),
                        (r"/api/v1/jobs/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})",
                                jobs.APIv1ControlHandler),
-                       (r"/api/v1/jobs/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/finished",
-                               jobs.APIv1FinishedHandler),
+                       (r"/api/v1/jobs/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})", jobs.APIv1IndexHandler),
                        (r"/api/v1/jobs/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/log/stream",
                                jobs.APIv1LogStreamHandler),
 

diff --git a/src/web/jobs.py b/src/web/jobs.py
index 598c366b94fb5a167af344848f2b315c3ddb0670..4396d1eef6092a368834c0b495d6c007d0dad173 100644 (file)
--- a/src/web/jobs.py
+++ b/src/web/jobs.py
@@ -66,8 +66,8 @@ class APIv1ControlHandler(base.APIMixin, tornado.websocket.WebSocketHandler):
                await self.logstream.message(timestamp, level, message)
 
 
-class APIv1FinishedHandler(base.APIMixin, tornado.web.RequestHandler):
-       @tornado.web.authenticated
+class APIv1IndexHandler(base.APIMixin, tornado.web.RequestHandler):
+       @base.negotiate
        async def post(self, uuid):
                job = self.backend.jobs.get_by_uuid(uuid)
                if not job:
@@ -99,9 +99,7 @@ class APIv1FinishedHandler(base.APIMixin, tornado.web.RequestHandler):
                        self.backend.run_task(self.backend.builds.launch, builds)
 
                # Send something back to the builder
-               self.finish({
-                       "status" : "ok",
-               })
+               self.finish({})
 
 
 class APIv1LogStreamHandler(base.BackendMixin, tornado.websocket.WebSocketHandler):