@codefresh-io/service-base 6.0.1-beta → 6.0.2-beta

package/infra/index.js

@@ -119,8 +119,10 @@ class Microservice {
         logger.info(`Starting shutdown... Timeout: ${gracePeriod}`);
         const promises = [];
         if (enabledComponents.includes('mongo')) {
-            logger.info('About to stop mongo');
-            promises.push(mongo.stop.bind(mongo));
+            promises.push(async () => {
+                logger.info('About to stop mongo');
+                await mongo.stop();
+            });
         }
         if (enabledComponents.includes('eventbus')) {
             logger.info('About to stop eventbus');

package/infra/mongo.js

@@ -9,32 +9,40 @@ class Mongo {
 
     /**
      * starts the connection to mongo
-     * @returns {Promise<void>}
      */
     async init(config) {
         const clientSettings = { ...config.mongo.options };
-
         const logger = require('cf-logs').Logger('codefresh:infra:mongo'); // eslint-disable-line
         this.logger = logger;
 
         const { uri } = config.mongo;
+        logger.info(`Mongo db uri ${uri}`);
         const dbName = config.mongo.dbName || getDbNameFromUri(uri);
-        const client = await MongoClient.connect(uri, clientSettings);
+        const client = new MongoClient(uri, clientSettings);
+        logger.info(`Mongo db name ${dbName}`);
+
+        try {
+            await client.connect();
+            logger.info('Mongo driver connected');
+        } catch (error) {
+            logger.error('Error connecting to MongoDB:', error);
+            throw error; // Re-throw the error to propagate it
+        }
+
         this.client = client;
-        this.db = client.db(dbName);
-        logger.info('Mongo driver connected');
+        this.db = this.client.db(dbName);
+        logger.info('Mongo db initialized');
     }
 
 
     /**
      * stops the connection to mongo
-     * @returns {Promise<void>}
      */
-    stop() {
+    async stop() {
         if (!this.db) {
-            return Promise.resolve();
+            return;
         }
-        return this.client.close();
+        await this.client.close();
     }
 
     collection(collectionName) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codefresh-io/service-base",
-  "version": "6.0.1-beta",
+  "version": "6.0.2-beta",
   "main": "index.js",
   "description": "",
   "bin": {
@@ -52,7 +52,7 @@
     "js-yaml": "^3.13.1",
     "lodash": "4.17.21",
     "method-override": "^3.0.0",
-    "mongodb": "4.17.1",
+    "mongodb": "^6.8.0",
     "morgan": "^1.9.1",
     "node-uuid": "^1.4.8",
     "proxyquire": "^1.8.0",