refactor: refactor shutdown connection typeorm and rabbitmq

meysamhadeli · Dec 19, 2023 · c675e1e · c675e1e
1 parent 9fbb310
commit c675e1e
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 39 deletions.
diff --git a/src/booking/src/app.ts b/src/booking/src/app.ts
@@ -35,7 +35,7 @@ const startupApp = async () => {
 
   app.use(morganMiddleware);
 
-  const databaseConnection = await initialDbContext(postgresOptions);
+  await initialDbContext(postgresOptions);
 
   app.use(helmet());
 
@@ -60,7 +60,7 @@ const startupApp = async () => {
     logger.info(`Listening to http://localhost:${config.port}`);
   });
 
-  const rabbitmq = await initialRabbitmq();
+  await initialRabbitmq();
 
   await initialHttpClientServices();
 
@@ -71,11 +71,7 @@ const startupApp = async () => {
   }
 
   process.on('SIGINT', async () => {
-    await databaseConnection.destroy();
-    await rabbitmq.closeConnection();
-    server.close(function () {
-      process.exit(0);
-    });
+    server.close();
     Logger.info('Application shutdown gracefully.');
   });
 };

diff --git a/src/building-blocks/rabbitmq/rabbitmq-connection.js b/src/building-blocks/rabbitmq/rabbitmq-connection.js
diff --git a/src/building-blocks/rabbitmq/rabbitmq-connection.js.map b/src/building-blocks/rabbitmq/rabbitmq-connection.js.map
diff --git a/src/building-blocks/rabbitmq/rabbitmq-connection.ts b/src/building-blocks/rabbitmq/rabbitmq-connection.ts
@@ -42,7 +42,13 @@ export class RabbitMQConnection implements IRabbitMQConnection {
               password: options?.password ?? config.rabbitmq.password
             });
 
-            Logger.info('RabbitMq connection created successfully');
+            Logger.info('Rabbitmq connection created successfully');
+
+            process.on('SIGINT', async () => {
+              if (connection) {
+                await this.closeConnection();
+              }
+            });
           },
           {
             retries: config.retry.count,
@@ -112,10 +118,10 @@ export class RabbitMQConnection implements IRabbitMQConnection {
     try {
       if (connection) {
         await connection.close();
-        Logger.info('Connection closed successfully');
+        Logger.info('Connection rabbitmq closed gracefully!');
       }
     } catch (error) {
-      Logger.error('Connection close failed!');
+      Logger.error('Connection rabbitmq close failed!');
     }
   }
 }
diff --git a/src/building-blocks/tsconfig.tsbuildinfo b/src/building-blocks/tsconfig.tsbuildinfo
diff --git a/src/building-blocks/typeorm/db-context.js b/src/building-blocks/typeorm/db-context.js
diff --git a/src/building-blocks/typeorm/db-context.js.map b/src/building-blocks/typeorm/db-context.js.map
diff --git a/src/building-blocks/typeorm/db-context.ts b/src/building-blocks/typeorm/db-context.ts
@@ -25,6 +25,12 @@ export class DbContext implements IDbContext {
 
       Logger.info('Data Source has been initialized!');
 
+      process.on('SIGINT', async () => {
+        if (connection) {
+          await this.closeConnection();
+        }
+      });
+
       if (config.env !== 'test') {
         try {
         } catch (error) {
@@ -34,7 +40,7 @@ export class DbContext implements IDbContext {
         Logger.info('Migrations run successfully!');
       }
     } catch (error) {
-      throw new Error(`Error during database initialization: ${error.toString()}`);
+      throw new Error(error);
     }
 
     return connection;
@@ -46,5 +52,6 @@ export class DbContext implements IDbContext {
 
   async closeConnection(): Promise<void> {
     await connection.destroy();
+    Logger.info('Connection postgres destroyed gracefully!');
   }
 }
diff --git a/src/flight/src/app.ts b/src/flight/src/app.ts
@@ -34,7 +34,7 @@ const startupApp = async () => {
 
   app.use(morganMiddleware);
 
-  const databaseConnection = await initialDbContext(postgresOptions);
+  await initialDbContext(postgresOptions);
 
   app.use(helmet());
 
@@ -59,7 +59,7 @@ const startupApp = async () => {
     logger.info(`Listening http://localhost:${config.port}`);
   });
 
-  const rabbitmq = await initialRabbitmq();
+  await initialRabbitmq();
 
   await registerMediatrHandlers();
 
@@ -68,11 +68,7 @@ const startupApp = async () => {
   }
 
   process.on('SIGINT', async () => {
-    await databaseConnection.destroy();
-    await rabbitmq.closeConnection();
-    server.close(function () {
-      process.exit(0);
-    });
+    server.close();
     Logger.info('Application shutdown gracefully.');
   });
 };

diff --git a/src/identity/src/app.ts b/src/identity/src/app.ts
@@ -34,7 +34,7 @@ const startupApp = async () => {
 
   app.use(morganMiddleware);
 
-  const databaseConnection = await initialDbContext(postgresOptions);
+  await initialDbContext(postgresOptions);
 
   app.use(helmet());
 
@@ -59,7 +59,7 @@ const startupApp = async () => {
     logger.info(`Listening to http://localhost:${config.port}`);
   });
 
-  const rabbitmq = await initialRabbitmq();
+  await initialRabbitmq();
 
   await registerMediatrHandlers();
 
@@ -68,11 +68,7 @@ const startupApp = async () => {
   }
 
   process.on('SIGINT', async () => {
-    await databaseConnection.destroy();
-    await rabbitmq.closeConnection();
-    server.close(function () {
-      process.exit(0);
-    });
+    server.close();
     Logger.info('Application shutdown gracefully.');
   });
 };

diff --git a/src/passenger/src/app.ts b/src/passenger/src/app.ts
@@ -34,7 +34,7 @@ const startupApp = async () => {
 
   app.use(morganMiddleware);
 
-  const databaseConnection = await initialDbContext(postgresOptions);
+  await initialDbContext(postgresOptions);
 
   app.use(helmet());
 
@@ -59,7 +59,7 @@ const startupApp = async () => {
     logger.info(`Listening to http://localhost:${config.port}`);
   });
 
-  const rabbitmq = await initialRabbitmq();
+  await initialRabbitmq();
 
   await registerMediatrHandlers();
 
@@ -68,11 +68,7 @@ const startupApp = async () => {
   }
 
   process.on('SIGINT', async () => {
-    await databaseConnection.destroy();
-    await rabbitmq.closeConnection();
-    server.close(function () {
-      process.exit(0);
-    });
+    server.close();
     Logger.info('Application shutdown gracefully.');
   });
 };