d

taskexecutor/app/base/db/task.base.js

@@ -28,9 +28,12 @@ class TaskBase {
     //任务打点
     //任务打点
     //key taskuptime
     //key taskuptime
     let taskName = this.formatedTaskName(this.serviceName)
     let taskName = this.formatedTaskName(this.serviceName)
+    console.log(taskName, "vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv")
     if (taskName && taskName.trim() != "") {
     if (taskName && taskName.trim() != "") {
       let nowtime = Date.now()
       let nowtime = Date.now()
-      this.redisClient.hmset("taskuptime", { taskName: nowtime })
+      let tp = {}
+      tp[taskName] = nowtime
+      this.redisClient.hmset("taskuptime", tp)
     }
     }
     //订阅任务频道
     //订阅任务频道
     await this.redisClient.subscribe(this.TASK_CHANNEL);
     await this.redisClient.subscribe(this.TASK_CHANNEL);

taskexecutor/app/base/db/task/monitor/monitorTask.js

@@ -12,32 +12,39 @@ class MonitorTask extends TaskBase {
    * @param {*} taskName 
    * @param {*} taskName 
    */
    */
   formatedTaskName (taskName) {
   formatedTaskName (taskName) {
+    console.log("formatedTaskName", "ddddddddddddddddddd")
     return taskName + "|i|10"
     return taskName + "|i|10"
   }
   }
   isFail (taskName, lastAccess) {
   isFail (taskName, lastAccess) {
     let n = Date.now()
     let n = Date.now()
     let postMinute = (n - lastAccess) / 1000 / 60
     let postMinute = (n - lastAccess) / 1000 / 60
     let tnameparams = taskName.split("|")
     let tnameparams = taskName.split("|")
-    let tname = tnameparams[0].trim()
-    let mtype = tnameparams[1].trim()
-    let pvalue = Number(tnameparams[2].trim())
-    if (mtype == "i") {//每几分钟执行一次
-      console.log(taskName, postMinute, "xxxxxxxxxxxxxxxxxxxxxxx")
-      //如果流失的时间大于循环调度时间,则报异常到丁丁
-      if (postMinute > pvalue) {
-        this.sendDing(tname + "可能失联啦...请检查")
-      } else {
-        if (tname == this.serviceName) {
-          this.sendDing(tname + "监控精灵依然在线，请放心....")
+    if (tnameparams.length == 3) {
+      let tname = tnameparams[0].trim()
+      let mtype = tnameparams[1].trim()
+      let pvalue = Number(tnameparams[2].trim())
+      if (mtype == "i") {//每几分钟执行一次
+        console.log(taskName, postMinute, "xxxxxxxxxxxxxxxxxxxxxxx")
+        //如果流失的时间大于循环调度时间,则报异常到丁丁
+        if (postMinute > pvalue) {
+          this.sendDing(tname + "可能失联啦...请检查")
+        } else {
+          if (tname == this.serviceName) {
+            this.sendDing(tname + "监控精灵依然在线，请放心....")
+          }
         }
         }
       }
       }
-    }
-    if (mtype == "a") {//
-      let onedaym = 24 * 60
-      if (postMinute > onedaym) {
-        this.sendDing(tname + "可能失联啦...请检查")
+      if (mtype == "a") {//
+        let onedaym = 24 * 60
+        if (postMinute > onedaym) {
+          this.sendDing(tname + "可能失联啦...请检查")
+        }
       }
       }
+
+    } else {
+      this.sendDing(taskName + ":任务名不符合监控格式")
     }
     }
+
   }
   }
   async subBeforeTask (params) {
   async subBeforeTask (params) {
     console.log("前置操作......", this.serviceName);
     console.log("前置操作......", this.serviceName);