run_script uses ws.status

2gis · Sep 25, 2015 · 686863d · 686863d
1 parent ba5a891
commit 686863d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/vmmaster/webdriver/commands.py b/vmmaster/webdriver/commands.py
@@ -243,18 +243,19 @@ def run(*args):
     def on_message(ws, message):
         ws.output += message
         if sub_step:
-            msg = json.dumps({"status": 0, "output": ws.output})
+            msg = json.dumps({"status": ws.status, "output": ws.output})
             update_log_step(sub_step, message=msg)
 
     def on_close(ws):
         if sub_step and ws.output:
-            msg = json.dumps({"status": 0, "output": ws.output})
+            msg = json.dumps({"status": ws.status, "output": ws.output})
             update_log_step(sub_step, message=msg)
         log.info("RunScript: Close websocket on vm %s" % host)
 
     def on_error(ws, message):
         global status_code
         status_code = 500
+        ws.status = 1
         ws.output = repr(message)
         log.debug("RunScript error: %s" % message)
 

diff --git a/vmpool/vmqueue.py b/vmpool/vmqueue.py
@@ -62,7 +62,7 @@ def run(self):
                 if vm:
                     try:
                         self.queue.dequeue(delayed_vm)
-                    except ValueError:
+                    except QueueItemNotFound:
                         vm.delete()
                     else:
                         delayed_vm.vm = vm