From d9d2a12bdce7df3fa47411ce78ee2040aef1e4d4 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Thu, 23 Oct 2025 14:15:20 +0200
Subject: [PATCH] Use EnvConfig for logging settings

---
 src/api/Server.ts    | 8 ++++----
 src/bundle/Server.ts | 8 ++++----
 src/cdn/Server.ts    | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/api/Server.ts b/src/api/Server.ts
index f27d1b847..ab0505d7c 100644
--- a/src/api/Server.ts
+++ b/src/api/Server.ts
@@ -23,7 +23,7 @@ import { Server, ServerOptions } from "lambert-server/Server";
 import { red } from "picocolors";
 import { initDatabase, Message } from "@spacebar/database";
 import { GifProviderManager } from "@spacebar/integrations/gifs";
-import { Config, ConnectionConfig, ConnectionLoader, Email, JSONReplacer, WebAuthn, initEvent, registerRoutes, JwtKeypairManager } from "@spacebar/util";
+import { Config, ConnectionConfig, ConnectionLoader, Email, JSONReplacer, WebAuthn, initEvent, registerRoutes, JwtKeypairManager, EnvConfig } from "@spacebar/util";
 import { ProcessLifecycle, SystemdLifecycle } from "../util/util/ProcessLifecycle";
 import { Monitoring } from "../util/monitoring/Monitoring";
 // import { BcryptWorkerPool } from "../util/util/workers/bcrypt/BcryptWorkerPool";
@@ -65,13 +65,13 @@ export class SpacebarServer extends Server {
         // await BcryptWorkerPool.Init(8); // TODO: make configurable
         await GifProviderManager.init();
 
-        const logRequests = process.env["LOG_REQUESTS"] != undefined;
+        const logRequests = EnvConfig.logging.logRequests !== "";
         if (logRequests) {
             this.app.use(
                 morgan("combined", {
                     skip: (req, res) => {
-                        let skip = !(process.env["LOG_REQUESTS"]?.includes(res.statusCode.toString()) ?? false);
-                        if (process.env["LOG_REQUESTS"]?.charAt(0) == "-") skip = !skip;
+                        let skip = !(EnvConfig.logging.logRequests.includes(res.statusCode.toString()) ?? false);
+                        if (EnvConfig.logging.logRequests.charAt(0) == "-") skip = !skip;
                         return skip;
                     },
                 }),
diff --git a/src/bundle/Server.ts b/src/bundle/Server.ts
index d76866926..6e0bb3c85 100644
--- a/src/bundle/Server.ts
+++ b/src/bundle/Server.ts
@@ -26,7 +26,7 @@ import { SpacebarServer } from "@spacebar/api";
 import { CDNServer } from "@spacebar/cdn";
 import { initDatabase } from "@spacebar/database";
 import { GatewayServer } from "@spacebar/gateway";
-import { Config } from "@spacebar/util";
+import { Config, EnvConfig } from "@spacebar/util";
 import { WebrtcServer } from "@spacebar/webrtc";
 import { ProcessLifecycle } from "../util/util/ProcessLifecycle";
 import { Monitoring } from "../util/monitoring/Monitoring";
@@ -61,13 +61,13 @@ async function main() {
     await initDatabase();
     await Config.init();
 
-    const logRequests = process.env["LOG_REQUESTS"] != undefined;
+    const logRequests = EnvConfig.logging.logRequests != "";
     if (logRequests) {
         app.use(
             morgan("combined", {
                 skip: (req, res) => {
-                    let skip = !(process.env["LOG_REQUESTS"]?.includes(res.statusCode.toString()) ?? false);
-                    if (process.env["LOG_REQUESTS"]?.charAt(0) == "-") skip = !skip;
+                    let skip = !(EnvConfig.logging.logRequests.includes(res.statusCode.toString()) ?? false);
+                    if (EnvConfig.logging.logRequests.charAt(0) == "-") skip = !skip;
                     return skip;
                 },
             }),
diff --git a/src/cdn/Server.ts b/src/cdn/Server.ts
index b585fc7c4..1562f11e0 100644
--- a/src/cdn/Server.ts
+++ b/src/cdn/Server.ts
@@ -21,7 +21,7 @@ import morgan from "morgan";
 import { Server, ServerOptions } from "lambert-server/Server";
 import { CORS, BodyParser, Authentication } from "@spacebar/api/middlewares";
 import { Attachment, initDatabase } from "@spacebar/database";
-import { Config, JwtKeypairManager, registerRoutes } from "@spacebar/util";
+import { Config, JwtKeypairManager, registerRoutes, EnvConfig } from "@spacebar/util";
 import { ProcessLifecycle, SystemdLifecycle } from "../util/util/ProcessLifecycle";
 import { Monitoring } from "../util/monitoring/Monitoring";
 import guildProfilesRoute from "./routes/guild-profiles";
@@ -49,13 +49,13 @@ export class CDNServer extends Server {
             (_) => console.log("[CDN] Attachment migration failed"),
         );
 
-        const logRequests = process.env["LOG_REQUESTS"] != undefined;
+        const logRequests = EnvConfig.logging.logRequests != undefined;
         if (logRequests) {
             this.app.use(
                 morgan("combined", {
                     skip: (req, res) => {
-                        let skip = !(process.env["LOG_REQUESTS"]?.includes(res.statusCode.toString()) ?? false);
-                        if (process.env["LOG_REQUESTS"]?.charAt(0) == "-") skip = !skip;
+                        let skip = !(EnvConfig.logging.logRequests.includes(res.statusCode.toString()) ?? false);
+                        if (EnvConfig.logging.logRequests.charAt(0) == "-") skip = !skip;
                         return skip;
                     },
                 }),