Fix logs for action

mieweb · Sep 24, 2023 · 5852a7d · 5852a7d
1 parent 518dcf6
commit 5852a7d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/src/containers/action/ActionRunnerContainer.ts b/src/containers/action/ActionRunnerContainer.ts
@@ -73,6 +73,7 @@ export class ActionRunnerContainer extends Container {
   private generatedFileService: FileContentService;
   private userConfigService: UserConfigService;
   private tempFileService: FileContentService;
+  private isErr = false;
 
   async init(engine: ContainerEngine): Promise<void> {
     await super.init(engine);
@@ -238,6 +239,8 @@ export class ActionRunnerContainer extends Container {
 
     const ownerRepo = await gitScanner.getOwnerRepo();
 
+    this.isErr = false;
+
     const actionDefs = await this.convertActionYaml(config.actions_yaml);
     for (const actionDef of actionDefs) {
       if (actionDef.on !== this.params['trigger']) {
@@ -282,6 +285,7 @@ export class ActionRunnerContainer extends Container {
             break;
         }
         if (0 !== lastCode) {
+          this.isErr = true;
           break;
         }
       }
@@ -310,4 +314,8 @@ export class ActionRunnerContainer extends Container {
     }
     return additionalEnv;
   }
+
+  public failed() {
+    return this.isErr;
+  }
 }
diff --git a/src/containers/job/JobManagerContainer.ts b/src/containers/job/JobManagerContainer.ts
@@ -580,6 +580,7 @@ export class JobManagerContainer extends Container {
     await this.engine.registerContainer(runActionContainer);
     try {
       await runActionContainer.run(folderId);
+      return runActionContainer.failed();
     } finally {
       fs.rmSync(tempPath, { recursive: true, force: true });
       await this.engine.unregisterContainer(runActionContainer.params.name);
@@ -808,13 +809,24 @@ export class JobManagerContainer extends Container {
         break;
       case 'run_action':
         try {
-          await this.runAction(driveId, currentJob.id, currentJob.trigger, currentJob.payload, currentJob.user);
+          const isFailed = await this.runAction(driveId, currentJob.id, currentJob.trigger, currentJob.payload, currentJob.user);
           await this.clearGitCache(driveId);
 
-          this.engine.emit(driveId, 'toasts:added', {
-            title: 'Action done',
-            type: 'run_action:done',
-          });
+          if (isFailed) {
+            this.engine.emit(driveId, 'toasts:added', {
+              title: 'Action failed',
+              type: 'run_action:failed',
+              err: 'One on action steps has failed',
+              links: {
+                '#drive_logs': 'View logs'
+              }
+            });
+          } else {
+            this.engine.emit(driveId, 'toasts:added', {
+              title: 'Action done',
+              type: 'run_action:done',
+            });
+          }
         } catch (err) {
           this.engine.emit(driveId, 'toasts:added', {
             title: 'Action failed',