From 0e718cb7b27d133e8e0709dd3fc3cd64b57b33a4 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 19 Mar 2024 08:39:41 +0100
Subject: [PATCH] Fix cancel on stall error message

---
 .../core/lib/runners/job-handlers/abstract-job-handler.ts   | 5 +++--
 .../core/lib/schedulers/runner-job-watch-dog-scheduler.ts   | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/server/core/lib/runners/job-handlers/abstract-job-handler.ts b/server/core/lib/runners/job-handlers/abstract-job-handler.ts
index 1cc8f236c..d31effee6 100644
--- a/server/core/lib/runners/job-handlers/abstract-job-handler.ts
+++ b/server/core/lib/runners/job-handlers/abstract-job-handler.ts
@@ -199,11 +199,12 @@ export abstract class AbstractJobHandler <C, U extends RunnerJobUpdatePayload, S
 
   async abort (options: {
     runnerJob: MRunnerJob
+    abortNotSupportedErrorMessage?: string
   }) {
-    const { runnerJob } = options
+    const { runnerJob, abortNotSupportedErrorMessage = 'Job has been aborted but it is not supported by this job type' } = options
 
     if (this.isAbortSupported() !== true) {
-      return this.error({ runnerJob, message: 'Job has been aborted but it is not supported by this job type' })
+      return this.error({ runnerJob, message: abortNotSupportedErrorMessage })
     }
 
     await this.specificAbort(options)
diff --git a/server/core/lib/schedulers/runner-job-watch-dog-scheduler.ts b/server/core/lib/schedulers/runner-job-watch-dog-scheduler.ts
index 941e79c3e..7669e359b 100644
--- a/server/core/lib/schedulers/runner-job-watch-dog-scheduler.ts
+++ b/server/core/lib/schedulers/runner-job-watch-dog-scheduler.ts
@@ -32,7 +32,11 @@ export class RunnerJobWatchDogScheduler extends AbstractScheduler {
       logger.info('Abort stalled runner job %s (%s)', stalled.uuid, stalled.type, lTags(stalled.uuid, stalled.type))
 
       const Handler = getRunnerJobHandlerClass(stalled)
-      await new Handler().abort({ runnerJob: stalled })
+
+      await new Handler().abort({
+        runnerJob: stalled,
+        abortNotSupportedErrorMessage: 'Stalled runner job'
+      })
     }
   }