Merge pull request #2190 from blended-bram/patch-0

fix: hide retry message when no retries will be attempted
nestjs · Oct 21, 2024 · a6285c2 · a6285c2
2 parents b681904 + 531584b
commit a6285c2
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/lib/common/mongoose.utils.ts b/lib/common/mongoose.utils.ts
@@ -1,7 +1,7 @@
-import { Logger } from '@nestjs/common';
-import { Observable } from 'rxjs';
-import { delay, retryWhen, scan } from 'rxjs/operators';
-import { DEFAULT_DB_CONNECTION } from '../mongoose.constants';
+import { Logger } from "@nestjs/common";
+import { Observable } from "rxjs";
+import { delay, retryWhen, scan } from "rxjs/operators";
+import { DEFAULT_DB_CONNECTION } from "../mongoose.constants";
 
 export function getModelToken(model: string, connectionName?: string) {
   if (connectionName === undefined) {
@@ -29,12 +29,17 @@ export function handleRetry(
           scan((errorCount, error) => {
             const verboseMessage = verboseRetryLog
               ? ` Message: ${error.message}.`
-              : '';
+              : "";
+            const retryMessage = retryAttempts > 0
+              ? ` Retrying (${errorCount + 1})...`
+              : "";
 
             logger.error(
-              `Unable to connect to the database.${verboseMessage} Retrying (${
-                errorCount + 1
-              })...`,
+              [
+                "Unable to connect to the database.",
+                verboseMessage,
+                retryMessage,
+              ].join(""),
               error.stack,
             );
             if (errorCount + 1 >= retryAttempts) {