修复订阅任务创建逻辑

daleyjh · May 29, 2022 · 706b5e8 · 706b5e8
1 parent b55c7d5
commit 706b5e8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/back/loaders/initTask.ts b/back/loaders/initTask.ts
@@ -26,6 +26,11 @@ export default async () => {
   // 运行所有订阅
   const subs = await subscriptionService.list();
   for (const sub of subs) {
-    await subscriptionService.handleTask(sub, true, true, true);
+    await subscriptionService.handleTask(
+      sub,
+      !sub.is_disabled,
+      true,
+      !sub.is_disabled,
+    );
   }
 };
diff --git a/back/services/subscription.ts b/back/services/subscription.ts
@@ -286,7 +286,7 @@ export default class SubscriptionService {
 
   public async update(payload: Subscription): Promise<Subscription> {
     const newDoc = await this.updateDb(payload);
-    await this.handleTask(newDoc);
+    await this.handleTask(newDoc, !newDoc.is_disabled);
     return newDoc;
   }
 
@@ -360,7 +360,6 @@ export default class SubscriptionService {
           this.logger.silly(error);
         }
       }
-      await this.handleTask(doc, false);
       const command = this.formatCommand(doc);
       const err = await this.killTask(command);
       const absolutePath = await this.handleLogPath(doc.log_path as string);