feat(schedule): error handling and cleanup

jiawei397 · Nov 10, 2023 · 5011491 · 5011491
1 parent ba86952
commit 5011491
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/modules/schedule/src/scheduler.explorer.ts b/modules/schedule/src/scheduler.explorer.ts
@@ -25,7 +25,7 @@ export class ScheduleExplorer {
           try {
             await instance[methodName]();
           } catch (err) {
-            console.error("SchedulerError", err);
+            console.error("ScheduleCronError", err);
           }
         });
       });
@@ -47,7 +47,9 @@ export class ScheduleExplorer {
           try {
             await instance[methodName]();
           } catch (err) {
-            console.error("SchedulerError", err);
+            console.error("ScheduleTimeoutError", err);
+          } finally {
+            schedulerRegistry.timeCaches.delete(timeKey);
           }
         }, delay);
         schedulerRegistry.registerTime(timeKey, jobName);
@@ -70,7 +72,7 @@ export class ScheduleExplorer {
           try {
             await instance[methodName]();
           } catch (err) {
-            console.error("SchedulerError", err);
+            console.error("ScheduleIntervalError", err);
           }
         }, delay);
         schedulerRegistry.registerTime(timeKey, jobName);

diff --git a/modules/schedule/src/scheduler.registry.ts b/modules/schedule/src/scheduler.registry.ts
@@ -38,17 +38,35 @@ class SchedulerRegistry {
     this.timeCaches.set(name, timeKey);
   }
 
+  clearTimeoutByKey(timeKey: number) {
+    this.timeCaches.forEach((key, name) => {
+      if (key === timeKey) {
+        this.clearTimeout(name);
+      }
+    });
+  }
+
+  clearIntervalByKey(timeKey: number) {
+    this.timeCaches.forEach((key, name) => {
+      if (key === timeKey) {
+        this.clearInterval(name);
+      }
+    });
+  }
+
   clearTimeout(name: string) {
     const key = this.timeCaches.get(name);
     if (key) {
       clearTimeout(key);
+      this.timeCaches.delete(name);
     }
   }
 
   clearInterval(name: string) {
     const key = this.timeCaches.get(name);
     if (key) {
       clearInterval(key);
+      this.timeCaches.delete(name);
     }
   }