Use EnvConfig for logging settings

This commit is contained in:
Rory& committed 2026-11-03 01:51:19 +01:00
1 parent 8fdc3e5e52
commit d9d2a12bdc
3 files changed
+12 -12

No files matched your search

+4 -4
View File
@@ -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;
},
}),
+4 -4
View File
@@ -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;
},
}),
+4 -4
View File
@@ -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;
},
}),