Merge https://github.com/nestjs/typeorm into fix-connection-error-output

nestjs · May 25, 2020 · 3082e30 · 3082e30
2 parents b02e7f9 + 86a0f4f
commit 3082e30
Show file tree

Hide file tree

Showing 5 changed files with 277 additions and 365 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -183,10 +183,10 @@ Footer should contain a [closing reference to an issue](https://help.github.com/
 Samples: (even more [samples](https://github.com/nestjs/nest/commits/master))
 
 ```
-docs(changelog) update change log to beta.5
+docs(changelog): update change log to beta.5
 ```
 ```
-bugfix(@nestjs/core) need to depend on latest rxjs and zone.js
+bugfix(@nestjs/core): need to depend on latest rxjs and zone.js
 
 The version in our package.json gets copied to the one we publish, and users need the latest of these.
 ```

diff --git a/lib/common/typeorm.utils.ts b/lib/common/typeorm.utils.ts
@@ -110,21 +110,27 @@ export function getEntityManagerToken(
 export function handleRetry(
   retryAttempts = 9,
   retryDelay = 3000,
+  connectionName = DEFAULT_CONNECTION_NAME,
   verboseRetryLog = false,
 ): <T>(source: Observable<T>) => Observable<T> {
   return <T>(source: Observable<T>) =>
     source.pipe(
       retryWhen((e) =>
         e.pipe(
           scan((errorCount, error: Error) => {
-            const message = verboseRetryLog
-              ? `Unable to connect to the database. Message: ${
-                  error.message
-                }. Retrying (${errorCount + 1})...`
-              : `Unable to connect to the database. Retrying (${
-                  errorCount + 1
-                })...`;
-            logger.error(message, error.stack);
+            const connectionInfo =
+              connectionName === DEFAULT_CONNECTION_NAME
+                ? ''
+                : ` (${connectionName})`;
+            const verboseMessage = verboseRetryLog
+              ? ` Message: ${error.message}.`
+              : '';
+            logger.error(
+              `Unable to connect to the database${connectionInfo}.${verboseMessage} Retrying (${
+                errorCount + 1
+              })...`,
+              error.stack,
+            );
             if (errorCount + 1 >= retryAttempts) {
               throw error;
             }

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(
@@ -205,6 +201,7 @@ export class TypeOrmCoreModule implements OnApplicationShutdown {
         handleRetry(
           options.retryAttempts,
           options.retryDelay,
+          connectionToken,
           options.verboseRetryLog,
         ),
       )