bug: fix issue with not passing match id

Author: lukepolo

src/app.module.ts

@@ -39,6 +39,7 @@ import { SystemService } from "./system/system.service";
 import { ClientsModule } from "@nestjs/microservices";
 import { Transport } from "@nestjs/microservices";
 import { DedicatedServersModule } from "./dedicated-servers/dedicated-servers.module";
+import { K8sModule } from "./k8s/k8s.module";
 
 @Module({
   imports: [
@@ -118,6 +119,7 @@ import { DedicatedServersModule } from "./dedicated-servers/dedicated-servers.mo
     InvitesModule,
     DemosModule,
     DedicatedServersModule,
+    K8sModule,
   ],
   providers: [loggerFactory()],
   controllers: [AppController, QuickConnectController],

src/game-server-node/game-server-node.controller.ts

@@ -10,7 +10,7 @@ import { MarkDedicatedServerOffline } from "./jobs/MarkDedicatedServerOffline";
 import { ConfigService } from "@nestjs/config";
 import { AppConfig } from "../configs/types/AppConfig";
 import { Request, Response } from "express";
-import { LoggingServiceService } from "./logging-service/logging-service.service";
+import { LoggingService } from "src/k8s/logging/logging.service";
 import { RconService } from "src/rcon/rcon.service";
 import { EventPattern } from "@nestjs/microservices";
 import { NodeStats } from "./interfaces/NodeStats";
@@ -29,7 +29,7 @@ export class GameServerNodeController {
     protected readonly config: ConfigService,
     protected readonly hasura: HasuraService,
     protected readonly tailscale: TailscaleService,
-    protected readonly loggingService: LoggingServiceService,
+    protected readonly loggingService: LoggingService,
     protected readonly gameServerNodeService: GameServerNodeService,
     @InjectQueue(GameServerQueues.GameUpdate) private gameUpdateQueue: Queue,
     @InjectQueue(GameServerQueues.NodeOffline)

src/game-server-node/game-server-node.module.ts

@@ -20,13 +20,13 @@ import { getQueuesProcessors } from "../utilities/QueueProcessors";
 import { loggerFactory } from "../utilities/LoggerFactory";
 import { MatchServerMiddlewareMiddleware } from "../matches/match-server-middleware/match-server-middleware.middleware";
 import { MarkDedicatedServerOffline } from "./jobs/MarkDedicatedServerOffline";
-import { LoggingServiceService } from "./logging-service/logging-service.service";
 import { RedisModule } from "src/redis/redis.module";
 import { NotificationsModule } from "src/notifications/notifications.module";
 import { RconModule } from "src/rcon/rcon.module";
 import { CheckServerPluginVersions } from "./jobs/CheckServerPluginVersions";
 import { HasuraService } from "src/hasura/hasura.service";
 import { GetPluginVersions } from "./jobs/GetPluginVersions";
+import { K8sModule } from "src/k8s/k8s.module";
 
 @Module({
   providers: [
@@ -38,7 +38,6 @@ import { GetPluginVersions } from "./jobs/GetPluginVersions";
     CheckServerPluginVersions,
     ...getQueuesProcessors("GameServerNode"),
     loggerFactory(),
-    LoggingServiceService,
   ],
   imports: [
     RedisModule,
@@ -47,6 +46,7 @@ import { GetPluginVersions } from "./jobs/GetPluginVersions";
     CacheModule,
     NotificationsModule,
     RconModule,
+    K8sModule,
     BullModule.registerQueue(
       {
         name: GameServerQueues.GameUpdate,
@@ -73,7 +73,7 @@ import { GetPluginVersions } from "./jobs/GetPluginVersions";
       },
     ),
   ],
-  exports: [LoggingServiceService, GameServerNodeService],
+  exports: [GameServerNodeService],
   controllers: [GameServerNodeController],
 })
 export class GameServerNodeModule implements OnApplicationBootstrap {

src/game-server-node/game-server-node.service.ts

@@ -8,7 +8,7 @@ import { NodeStats } from "./interfaces/NodeStats";
 import { PodStats } from "./interfaces/PodStats";
 import { RedisManagerService } from "src/redis/redis-manager/redis-manager.service";
 import { Redis } from "ioredis";
-import { LoggingServiceService } from "./logging-service/logging-service.service";
+import { LoggingService } from "src/k8s/logging/logging.service";
 import { PassThrough } from "stream";
 import { SteamConfig } from "src/configs/types/SteamConfig";
 import { isJsonEqual } from "@utilities/isJsonEqual";
@@ -33,7 +33,7 @@ export class GameServerNodeService {
     protected readonly config: ConfigService,
     protected readonly hasura: HasuraService,
     redisManager: RedisManagerService,
-    protected readonly loggingService: LoggingServiceService,
+    protected readonly loggingService: LoggingService,
   ) {
     this.gameServerConfig = this.config.get<GameServersConfig>("gameServers");
     this.namespace = this.gameServerConfig.namespace;

src/game-server-node/logging-service/logging-service.service.spec.ts

@@ -0,0 +1,9 @@
+import { Module } from "@nestjs/common";
+import { LoggingService } from "./logging/logging.service";
+import { loggerFactory } from "src/utilities/LoggerFactory";
+
+@Module({
+  providers: [LoggingService, loggerFactory()],
+  exports: [LoggingService],
+})
+export class K8sModule {}

src/k8s/k8s.module.ts

@@ -11,7 +11,7 @@ import {
 } from "@kubernetes/client-node";
 
 @Injectable()
-export class LoggingServiceService {
+export class LoggingService {
   private coreApi: CoreV1Api;
   private batchApi: BatchV1Api;
   private namespace = "5stack";
@@ -73,12 +73,22 @@ export class LoggingServiceService {
       pods = await this.getPodsFromService(service);
     }
 
+    const podLogs: Promise<void>[] = [];
     for (const pod of pods) {
-      await Promise.all([
-        this.getLogsForPod(pod, stream, download, previous, 250, archive),
-      ]);
+      podLogs.push(
+        this.getLogsForPod(
+          pod,
+          stream,
+          download,
+          previous,
+          archive,
+          download ? undefined : 250,
+        ),
+      );
     }
 
+    await Promise.all(podLogs);
+
     if (pods.length === 0) {
       stream.end();
     }
@@ -163,8 +173,8 @@ export class LoggingServiceService {
     stream: Writable,
     download = false,
     previous = false,
-    tailLines = 1,
     archive?: archiver.Archiver,
+    tailLines?: number,
   ) {
     let totalAdded = 0;
     let streamEnded = false;

…gging-service/logging-service.service.ts src/k8s/logging/logging.service.tssrc/game-server-node/logging-service/logging-service.service.ts renamed to src/k8s/logging/logging.service.ts src/game-server-node/logging-service/logging-service.service.ts renamed to src/k8s/logging/logging.service.ts

@@ -369,7 +369,7 @@ export class MatchesController {
         server.is_dedicated
           ? RestartDedicatedServer.name
           : StopOnDemandServer.name,
-        { serverId },
+        { serverId, matchId },
         delay ? { delay: delay * 1000 } : undefined,
       );
 

src/matches/matches.controller.ts

@@ -47,6 +47,7 @@ import { StopOnDemandServer } from "./jobs/StopOnDemandServer";
 import { MatchRelayController } from "./match-relay/match-relay.controller";
 import { MatchRelayService } from "./match-relay/match-relay.service";
 import { MatchRelayAuthMiddleware } from "./match-relay/match-relay-auth-middleware";
+import { K8sModule } from "src/k8s/k8s.module";
 
 @Module({
   imports: [
@@ -59,6 +60,7 @@ import { MatchRelayAuthMiddleware } from "./match-relay/match-relay-auth-middlew
     SocketsModule,
     PostgresModule,
     NotificationsModule,
+    K8sModule,
     forwardRef(() => DiscordBotModule),
     MatchMaking,
     ChatModule,

src/matches/matches.module.ts

@@ -1,6 +1,5 @@
 import { PassThrough } from "stream";
 import { Logger } from "@nestjs/common";
-import { LoggingServiceService } from "src/game-server-node/logging-service/logging-service.service";
 
 import {
   MessageBody,
@@ -11,14 +10,15 @@ import {
 import { FiveStackWebSocketClient } from "src/sockets/types/FiveStackWebSocketClient";
 import { isRoleAbove } from "src/utilities/isRoleAbove";
 import { GameServerNodeService } from "src/game-server-node/game-server-node.service";
+import { LoggingService } from "src/k8s/logging/logging.service";
 
 @WebSocketGateway({
   path: "/ws/web",
 })
 export class SystemGateway {
   constructor(
     protected readonly logger: Logger,
-    protected readonly loggingService: LoggingServiceService,
+    protected readonly loggingService: LoggingService,
   ) {}
 
   @SubscribeMessage("logs")