#build

Author: lukepolo

src/matches/match-assistant/match-assistant.service.spec.ts

@@ -73,7 +73,9 @@ describe("MatchAssistantService", () => {
       .spyOn(service, "delayCheckOnDemandServer")
       .mockResolvedValue(undefined);
 
-    await expect(service.rebootOnDemandServer("match-1")).resolves.toBeUndefined();
+    await expect(
+      service.rebootOnDemandServer("match-1"),
+    ).resolves.toBeUndefined();
 
     expect(setServerError).toHaveBeenCalledWith("match-1", null);
     expect(assignOnDemandServer).toHaveBeenCalledWith("match-1", {
@@ -147,9 +149,7 @@ describe("MatchAssistantService", () => {
     });
 
     jest.spyOn(service as any, "setServerError").mockResolvedValue(undefined);
-    jest
-      .spyOn(service as any, "assignOnDemandServer")
-      .mockResolvedValue(false);
+    jest.spyOn(service as any, "assignOnDemandServer").mockResolvedValue(false);
 
     await expect(service.rebootOnDemandServer("match-1")).rejects.toThrow(
       "no on demand servers are available to reboot this match",

src/matches/match-assistant/match-assistant.service.ts

@@ -1085,16 +1085,28 @@ export class MatchAssistantService {
         this.logger.verbose(`[${matchId}] remove pod`);
 
         if (!remove) {
-          await new Exec(kc).exec(
-            this.namespace,
-            pod.metadata!.name!,
-            pod.spec!.containers?.at(0)?.name,
-            ["kill", "-SIGUSR1", "1"],
-            process.stdout,
-            process.stderr,
-            process.stdin,
-            false,
-          );
+          // Only Running pods accept exec; anything else (Succeeded / Failed /
+          // Pending) responds 400 to the upgrade request. Skip those — there's
+          // nothing to signal.
+          if (pod.status?.phase !== "Running") {
+            continue;
+          }
+          try {
+            await new Exec(kc).exec(
+              this.namespace,
+              pod.metadata!.name!,
+              pod.spec!.containers?.at(0)?.name,
+              ["kill", "-SIGUSR1", "1"],
+              process.stdout,
+              process.stderr,
+              process.stdin,
+              false,
+            );
+          } catch (error) {
+            this.logger.warn(
+              `[${matchId}] graceful shutdown signal failed: ${error?.message || "exec error"}`,
+            );
+          }
           continue;
         }
         await core

src/matches/matches.controller.ts

@@ -452,7 +452,10 @@ export class MatchesController {
     /**
      * Server was removed from match
      */
-    if (data.old.server_id && !data.new.server_id || data.old.server_id !== data.new.server_id) {
+    if (
+      (data.old.server_id && !data.new.server_id) ||
+      data.old.server_id !== data.new.server_id
+    ) {
       await this.matchAssistant.stopOnDemandServer(matchId);
     }
 
@@ -479,7 +482,8 @@ export class MatchesController {
     }
 
     if (
-      (status === "Live" && data.old.status !== "WaitingForServer") ||
+      (status === "Live" &&
+        (!match.server || data.old.status !== "WaitingForServer")) ||
       (status === "WaitingForServer" &&
         data.old.server_id !== data.new.server_id)
     ) {
@@ -1539,4 +1543,4 @@ export class MatchesController {
 
     await this.matchAssistant.sendServerMatchId(match.id);
   }
-}
+}