Merge branch 'dsbert-log-conn-name'

nestjs · May 25, 2020 · bf3580d · bf3580d
2 parents ac077cb + 3c11893
commit bf3580d
Show file tree

Hide file tree

Showing 4 changed files with 2,417 additions and 2,591 deletions.
diff --git a/lib/common/typeorm.utils.ts b/lib/common/typeorm.utils.ts
@@ -110,14 +110,19 @@ export function getEntityManagerToken(
 export function handleRetry(
   retryAttempts = 9,
   retryDelay = 3000,
+  connectionName = DEFAULT_CONNECTION_NAME,
 ): <T>(source: Observable<T>) => Observable<T> {
   return <T>(source: Observable<T>) =>
     source.pipe(
       retryWhen(e =>
         e.pipe(
           scan((errorCount, error: Error) => {
+            const connectionInfo =
+              connectionName === DEFAULT_CONNECTION_NAME
+                ? ''
+                : ` (${connectionName})`;
             logger.error(
-              `Unable to connect to the database. Retrying (${errorCount +
+              `Unable to connect to the database${connectionInfo}. Retrying (${errorCount +
                 1})...`,
               error.stack,
             );

diff --git a/lib/typeorm-core.module.ts b/lib/typeorm-core.module.ts
@@ -28,11 +28,7 @@ import {
   TypeOrmModuleOptions,
   TypeOrmOptionsFactory,
 } from './interfaces/typeorm-options.interface';
-import {
-  DEFAULT_CONNECTION_NAME,
-  TYPEORM_MODULE_ID,
-  TYPEORM_MODULE_OPTIONS,
-} from './typeorm.constants';
+import { TYPEORM_MODULE_ID, TYPEORM_MODULE_OPTIONS } from './typeorm.constants';
 
 @Global()
 @Module({})
@@ -177,6 +173,7 @@ export class TypeOrmCoreModule implements OnApplicationShutdown {
       }
     } catch {}
 
+    const connectionToken = getConnectionName(options as ConnectionOptions);
     return await defer(() => {
       if (!options.type) {
         return createConnection();
@@ -185,7 +182,6 @@ export class TypeOrmCoreModule implements OnApplicationShutdown {
         return createConnection(options as ConnectionOptions);
       }
 
-      const connectionToken = options.name || DEFAULT_CONNECTION_NAME;
       let entities = options.entities;
       if (entities) {
         entities = entities.concat(
@@ -201,7 +197,9 @@ export class TypeOrmCoreModule implements OnApplicationShutdown {
         entities,
       } as ConnectionOptions);
     })
-      .pipe(handleRetry(options.retryAttempts, options.retryDelay))
+      .pipe(
+        handleRetry(options.retryAttempts, options.retryDelay, connectionToken),
+      )
       .toPromise();
   }
 }