From 028adf4181718c3de52c8b0f04c2ab0010417ef9 Mon Sep 17 00:00:00 2001
From: filesite <release@filesite.io>
Date: Wed, 5 Jun 2024 06:38:46 +0800
Subject: [PATCH] bug fix

---
 monitor.mjs | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/monitor.mjs b/monitor.mjs
index 4a2f200..99d3543 100644
--- a/monitor.mjs
+++ b/monitor.mjs
@@ -28,7 +28,7 @@ class Monitor {
         const _self = this;
 
         if ( !this.config || (typeof(forceReload) != 'undefined' && forceReload) ) {
-            console.log("Load config from %s", this.configFile);
+            common.log("Load config from %s", this.configFile);
             let config = await common.getConfigFromJsonFile(this.configFile);
 
             //覆盖默认配置
@@ -78,12 +78,12 @@ class Monitor {
             for (let i=0; i<total; i++) {
                 if (_self.tasks.find((item) => item.url == configs.monit_urls[i] && item.stats != 'done')) {continue;}
 
-                console.log("Checking url %s ...", configs.monit_urls[i]);
+                common.log("Checking url %s ...", configs.monit_urls[i]);
                 taskRes = await common.createHeroUnionTask(configs.monit_urls[i], '', configs);
                 if (taskRes && taskRes.code == 1) {
                     _self.tasks.push(taskRes.task);
                 }else {
-                    console.error("Monit task create failed", taskRes);
+                    common.error("Monit task create failed", taskRes);
                 }
             }
         }, {
@@ -103,18 +103,31 @@ class Monitor {
             task = _self.tasks[index];
             if (task.status == 'done') {continue;}
 
-            //console.log('Query task result of %s', task.id);
             taskRes = await common.queryHeroUnionTask(task.id, configs);
             if (taskRes && taskRes.code == 1) {
                 _self.tasks[index] = taskRes.task;        //更新任务数据
 
-                common.log('Task status: %s, url: %s, task id: %s', task.status, task.url, task.id);
+                common.log('Task status: %s, url: %s, task id: %s', taskRes.task.status, task.url, task.id);
 
-                if (task.status == 'done') {
+                if (taskRes.task.status == 'done') {
                     let currentTime = common.getLocalTimeString();
                     let logFile = path.resolve(_self.systemLogDir) + '/ok.log';
                     common.saveLog(logFile, `[${currentTime}] Url request success: ${task.url}, task id: ${task.id}\n`);
 
+                    //写入JSON格式的log
+                    logFile = path.resolve(_self.systemLogDir) + '/json_stats.log';
+                    let logData = {
+                        "time": currentTime,
+                        "url": task.url,
+                        "status": taskRes.task.status
+                    };
+                    common.saveLog(logFile, JSON.stringify(logData) + `\n`);
+                }else if (taskRes.task.status == 'failed') {
+                    //写入错误日志
+                    let currentTime = common.getLocalTimeString();
+                    let logFile = path.resolve(_self.systemLogDir) + '/fail.log';
+                    common.saveLog(logFile, `[${currentTime}] Url request failed: ${task.url}, task id: ${task.id}\n`);
+
                     //写入JSON格式的log
                     logFile = path.resolve(_self.systemLogDir) + '/json_stats.log';
                     let logData = {
@@ -125,23 +138,7 @@ class Monitor {
                     common.saveLog(logFile, JSON.stringify(logData) + `\n`);
                 }
             }else {
-                console.error("Monit task query failed", taskRes);
-
-                common.error('Connect warning, url: %s, task id: %s', task.url, task.id);
-
-                //写入日志
-                let currentTime = common.getLocalTimeString();
-                let logFile = path.resolve(_self.systemLogDir) + '/fail.log';
-                common.saveLog(logFile, `[${currentTime}] Url request failed: ${task.url}, task id: ${task.id}\n`);
-
-                //写入JSON格式的log
-                logFile = path.resolve(_self.systemLogDir) + '/json_stats.log';
-                let logData = {
-                    "time": currentTime,
-                    "url": task.url,
-                    "status": task.status
-                };
-                common.saveLog(logFile, JSON.stringify(logData) + `\n`);
+                common.error('Task query failed, url: %s, task id: %s', task.url, task.id, taskRes);
             }
         }