restart runner?

kulturspektakel · Sep 14, 2024 · 1c00077 · 1c00077
1 parent 846a995
commit 1c00077
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 22 deletions.
diff --git a/src/tasks/index.ts b/src/tasks/index.ts
@@ -37,29 +37,33 @@ const taskList = {
   nonceRequestInvalidate,
 };
 
-export default async function () {
-  const runnerOptions: RunnerOptions = {
-    connectionString: env.DIRECT_URL,
-    concurrency: 1,
-    taskList: taskList as any,
-    events,
-    crontab: [
-      '*/5 * * * * nuclinoUpdateMessage ?max=1&jobKey=nuclinoUpdateMessage&jobKeyMode=replace',
-      `0 0 * * * gmailSubscription ?id=booking&fill=1d&max=3 {"account":"booking@kulturspektakel.de"}`,
-      `0 0 * * * gmailSubscription ?id=info&fill=1d&max=3 {"account":"info@kulturspektakel.de"}`,
-      `0 0 * * * gmailSubscription ?id=lager&fill=1d&max=3 {"account":"lager@kulturspektakel.de"}`,
-    ].join('\n'),
-  };
+const runnerOptions: RunnerOptions = {
+  connectionString: env.DIRECT_URL,
+  concurrency: 1,
+  taskList: taskList as any,
+  events,
+  crontab: [
+    '*/5 * * * * nuclinoUpdateMessage ?max=1&jobKey=nuclinoUpdateMessage&jobKeyMode=replace',
+    `0 0 * * * gmailSubscription ?id=booking&fill=1d&max=3 {"account":"booking@kulturspektakel.de"}`,
+    `0 0 * * * gmailSubscription ?id=info&fill=1d&max=3 {"account":"info@kulturspektakel.de"}`,
+    `0 0 * * * gmailSubscription ?id=lager&fill=1d&max=3 {"account":"lager@kulturspektakel.de"}`,
+  ].join('\n'),
+};
 
-  const runner = await run(runnerOptions);
-  runner.promise.finally(async () => {
-    console.log('runner_error: restarting');
-    try {
-      await runner.stop();
-    } catch (e) {}
-    await sleep(5000);
-    await run(runnerOptions);
-  });
+let runner: Runner | null = null;
+
+export async function restart() {
+  console.log('runner_error: restarting');
+  try {
+    await runner?.stop();
+  } catch (e) {}
+  await sleep(5000);
+  await run(runnerOptions);
+}
+
+export default async function () {
+  runner = await run(runnerOptions);
+  runner.promise.finally(restart);
 }
 
 type Payload<T extends keyof typeof taskList> = Parameters<

diff --git a/src/tasks/taskEvents.ts b/src/tasks/taskEvents.ts
@@ -1,6 +1,7 @@
 import {EventEmitter} from 'events';
 import {WorkerEvents} from 'graphile-worker';
 import * as Sentry from '@sentry/node';
+import {restart} from '.';
 
 const emitter: WorkerEvents = new EventEmitter();
 
@@ -13,6 +14,8 @@ emitter.addListener('job:error', ({error, job, worker}) => {
   });
 });
 
+emitter.addListener('worker:fatalError', restart);
+
 [
   'pool:listen:error' as const,
   'pool:listen:release' as const,