From 52bb33b5665c535973feb544fd664e59a6d59d43 Mon Sep 17 00:00:00 2001
From: Brody Over <10548119+brody192@users.noreply.github.com>
Date: Tue, 13 Feb 2024 08:50:25 -0500
Subject: [PATCH] Disable buffered logs (#3892)

* Update main.ts

* Update command.ts

* Update queue-worker.ts

* Enable users to disable log buffering

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
---
 packages/twenty-docs/docs/start/self-hosting/self-hosting.mdx | 1 +
 packages/twenty-server/.env.example                           | 1 +
 packages/twenty-server/src/command.ts                         | 2 +-
 .../src/integrations/environment/environment.service.ts       | 4 ++++
 packages/twenty-server/src/main.ts                            | 2 +-
 packages/twenty-server/src/queue-worker.ts                    | 2 +-
 6 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/twenty-docs/docs/start/self-hosting/self-hosting.mdx b/packages/twenty-docs/docs/start/self-hosting/self-hosting.mdx
index c96947b02..f060bd803 100644
--- a/packages/twenty-docs/docs/start/self-hosting/self-hosting.mdx
+++ b/packages/twenty-docs/docs/start/self-hosting/self-hosting.mdx
@@ -146,6 +146,7 @@ import TabItem from '@theme/TabItem';
 
 <OptionTable options={[
     ['LOGGER_DRIVER', 'console', "The logging driver can be: 'console' or 'sentry'"],
+    ['LOGGER_IS_BUFFER_ENABLED', 'true', 'Buffer the logs before sending them to the logging driver'],
     ['LOG_LEVELS', 'error,warn', "The loglevels which are logged to the logging driver. Can include: 'log', 'warn', 'error'"],
     ['EXCEPTION_HANDLER_DRIVER', 'sentry', "The exception handler driver can be: 'console' or 'sentry'"],
     ['SENTRY_DSN', 'https://xxx@xxx.ingest.sentry.io/xxx', 'The sentry logging endpoint used if sentry logging driver is selected'],
diff --git a/packages/twenty-server/.env.example b/packages/twenty-server/.env.example
index bc7820274..fd7d10775 100644
--- a/packages/twenty-server/.env.example
+++ b/packages/twenty-server/.env.example
@@ -32,6 +32,7 @@ SIGN_IN_PREFILLED=true
 # SUPPORT_FRONT_HMAC_KEY=replace_me_with_front_chat_verification_secret
 # SUPPORT_FRONT_CHAT_ID=replace_me_with_front_chat_id
 # LOGGER_DRIVER=console
+# LOGGER_IS_BUFFER_ENABLED=true
 # EXCEPTION_HANDLER_DRIVER=sentry
 # SENTRY_DSN=https://xxx@xxx.ingest.sentry.io/xxx
 # LOG_LEVELS=error,warn
diff --git a/packages/twenty-server/src/command.ts b/packages/twenty-server/src/command.ts
index bbc07bec9..f811c92be 100644
--- a/packages/twenty-server/src/command.ts
+++ b/packages/twenty-server/src/command.ts
@@ -18,7 +18,7 @@ async function bootstrap() {
   };
 
   const app = await CommandFactory.createWithoutRunning(CommandModule, {
-    bufferLogs: true,
+    bufferLogs: process.env.LOGGER_IS_BUFFER_ENABLED === 'true',
     errorHandler,
     serviceErrorHandler: errorHandler,
   });
diff --git a/packages/twenty-server/src/integrations/environment/environment.service.ts b/packages/twenty-server/src/integrations/environment/environment.service.ts
index 8f6d8920a..93a2b7c21 100644
--- a/packages/twenty-server/src/integrations/environment/environment.service.ts
+++ b/packages/twenty-server/src/integrations/environment/environment.service.ts
@@ -236,6 +236,10 @@ export class EnvironmentService {
     );
   }
 
+  getLoggerIsBufferEnabled(): boolean | undefined {
+    return this.configService.get<boolean>('LOGGER_IS_BUFFER_ENABLED') ?? true;
+  }
+
   getExceptionHandlerDriverType(): ExceptionHandlerDriver {
     return (
       this.configService.get<ExceptionHandlerDriver>(
diff --git a/packages/twenty-server/src/main.ts b/packages/twenty-server/src/main.ts
index ebe9c1612..c0c8a0369 100644
--- a/packages/twenty-server/src/main.ts
+++ b/packages/twenty-server/src/main.ts
@@ -16,7 +16,7 @@ import { EnvironmentService } from './integrations/environment/environment.servi
 const bootstrap = async () => {
   const app = await NestFactory.create(AppModule, {
     cors: true,
-    bufferLogs: true,
+    bufferLogs: process.env.LOGGER_IS_BUFFER_ENABLED === 'true',
   });
   const logger = app.get(LoggerService);
 
diff --git a/packages/twenty-server/src/queue-worker.ts b/packages/twenty-server/src/queue-worker.ts
index 9f7b0cec5..cbc52cc9a 100644
--- a/packages/twenty-server/src/queue-worker.ts
+++ b/packages/twenty-server/src/queue-worker.ts
@@ -21,7 +21,7 @@ async function bootstrap() {
 
   try {
     const app = await NestFactory.createApplicationContext(QueueWorkerModule, {
-      bufferLogs: true,
+      bufferLogs: process.env.LOGGER_IS_BUFFER_ENABLED === 'true',
     });
 
     loggerService = app.get(LoggerService);