From 168fc2dcd8a8514f56d708a5f2f21ce169fbe1ff Mon Sep 17 00:00:00 2001 From: Rusko124 Date: Thu, 29 Aug 2019 13:10:23 +0600 Subject: [PATCH] Edits: small edits for upgrade task of celery --- server.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/server.py b/server.py index 0f237d0f..6493447e 100755 --- a/server.py +++ b/server.py @@ -88,16 +88,14 @@ def upgrade_screenly(self, branch, manage_network, upgrade_system): '-b', branch, '-n', manage_network, '-s', upgrade_system, - _bg=True) + _bg=True, + _err_to_out=True) while True: if not upgrade_process.process.alive: break self.update_state(state="PROGRESS", meta={'status': upgrade_process.process.stdout}) time.sleep(1) - if upgrade_process.process.stderr: - return {'status': '%s\nError: %s' % (upgrade_process.process.stdout, upgrade_process.process.stderr)} - return {'status': upgrade_process.process.stdout} @@ -1315,7 +1313,7 @@ class UpgradeScreenly(Resource): } }) def post(self): - for task in celery.control.inspect().active().get('worker@screenly'): + for task in celery.control.inspect(timeout=2.0).active().get('worker@screenly'): if task.get('type') == 'server.upgrade_screenly': return jsonify({'id': task.get('id')}) branch = request.form.get('branch')