From 26d746598eab75c61be8e43c32eba27b0739c67c Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Fri, 16 Dec 2022 20:20:06 +0800
Subject: [PATCH] * Fix bug for zanode.

---
 module/testtask/control.php | 1 +
 module/zanode/model.php     | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/module/testtask/control.php b/module/testtask/control.php
index 3d3eb21b60..d12e5cae63 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -1239,6 +1239,7 @@ class testtask extends control
         {
             $resultID = $this->testtask->initResult($runID, $caseID, $run->case->version, $automation->node);
             if(!dao::isError()) $this->zanode->runZTFScript($automation->id, $caseID, $resultID);
+            if(dao::isError()) return print(js::error(dao::getError()) . js::locate($this->createLink('zanode', 'browse'), 'parent'));
         }
 
         if(!empty($_POST))
diff --git a/module/zanode/model.php b/module/zanode/model.php
index 72ef622a27..62dc0eca34 100644
--- a/module/zanode/model.php
+++ b/module/zanode/model.php
@@ -725,6 +725,13 @@ class zanodemodel extends model
     {
         $automation = $this->getAutomationByID($scriptID);
         $node       = $this->getNodeByID($automation->node);
+
+        if(empty($node) or $node->status != 'running' or !$node->ip or !$node->ztf or !$node->tokenSN)
+        {
+            $this->dao->delete()->from(TABLE_TESTRESULT)->where('id')->eq($task)->exec();
+            return  dao::$errors = $this->lang->zanode->runTimeout;
+        }
+
         $params = array(
             'cmd'  => $automation->shell,
             'ids'  => strval($caseID),
@@ -733,7 +740,7 @@ class zanodemodel extends model
         );
 
         $result = json_decode(commonModel::http("http://{$node->ip}:{$node->ztf}/api/v1/jobs/add", json_encode($params), array(), array("Authorization:$node->tokenSN")));
-        if($result->code != 0)
+        if(empty($result) or $result->code != 0)
         {
             $this->dao->delete()->from(TABLE_TESTRESULT)->where('id')->eq($task)->exec();
             return  dao::$errors = $this->lang->zanode->runTimeout;