Fix mongodb using callback instead of promises

Issue: BB-632
scality · Nov 21, 2024 · df36e67 · df36e67
1 parent 5993669
commit df36e67
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 36 deletions.
diff --git a/extensions/notification/NotificationConfigManager.js b/extensions/notification/NotificationConfigManager.js
@@ -96,18 +96,11 @@ class NotificationConfigManager {
         MongoClient.connect(mongoUrl, {
             replicaSet: this._mongoConfig.replicaSet,
             useNewUrlParser: true,
-        },
-        (err, client) => {
-            if (err) {
-                this._logger.error('Could not connect to MongoDB', {
-                    method: 'NotificationConfigManager._setupMongoClient',
-                    error: err.message,
-                });
-                return cb(err);
-            }
+        }).then((client) => {
             this._logger.debug('Connected to MongoDB', {
                 method: 'NotificationConfigManager._setupMongoClient',
             });
+
             try {
                 this._mongoClient = client.db(this._mongoConfig.database, {
                     ignoreUndefined: true,
@@ -129,6 +122,12 @@ class NotificationConfigManager {
             } catch (error) {
                 return cb(error);
             }
+        }).catch((err) => {
+            this._logger.error('Could not connect to MongoDB', {
+                method: 'NotificationConfigManager._setupMongoClient',
+                error: err.message,
+            });
+            return cb(err);
         });
     }
 

diff --git a/extensions/utils/LocationStatusStream.js b/extensions/utils/LocationStatusStream.js
@@ -67,14 +67,7 @@ class LocationStatusStream {
                 replicaSet: this._mongoConfig.replicaSet,
                 useNewUrlParser: true,
                 useUnifiedTopology: true,
-        }, (err, client) => {
-            if (err) {
-                this._log.error('Could not connect to MongoDB', {
-                    method: 'ServiceStatusManager._setupMongoClient',
-                    error: err.message,
-                });
-                return cb(err);
-            }
+        }).then((client) => {
             // connect to metadata DB
             this._mongoClient = client.db(this._mongoConfig.database, {
                 ignoreUndefined: true,
@@ -96,7 +89,13 @@ class LocationStatusStream {
                 return cb();
             });
             return undefined;
-        });
+        }).catch((err) => {
+                this._log.error('Could not connect to MongoDB', {
+                    method: 'ServiceStatusManager._setupMongoClient',
+                    error: err.message,
+                });
+                return cb(err);
+            });
     }
 
     /**

diff --git a/lib/api/BackbeatAPI.js b/lib/api/BackbeatAPI.js
@@ -1339,14 +1339,7 @@ class BackbeatAPI {
                 replicaSet: mongoConfig.replicaSet,
                 useNewUrlParser: true,
                 useUnifiedTopology: true,
-            }, (err, client) => {
-                if (err) {
-                    this._logger.error('Could not connect to MongoDB', {
-                        method: 'BackbeatAPI._setupMongoClient',
-                        error: err.message,
-                    });
-                    return cb(err);
-                }
+            }).then((client) => {
                 // connect to metadata DB
                 this._mongoClient = client.db(mongoConfig.database, {
                     ignoreUndefined: true,
@@ -1355,6 +1348,14 @@ class BackbeatAPI {
                     method: 'BackbeatAPI._setupMongoClient',
                 });
                 return cb();
+            }).catch((err) => {
+                if (err) {
+                    this._logger.error('Could not connect to MongoDB', {
+                        method: 'BackbeatAPI._setupMongoClient',
+                        error: err.message,
+                    });
+                    return cb(err);
+                }
             });
         }
     }

diff --git a/lib/util/LocationStatusManager.js b/lib/util/LocationStatusManager.js
@@ -68,7 +68,10 @@ class LocationStatusManager {
      * @return {undefined}
      */
     _initCollection(cb) {
-        this._mongoClient.createCollection(locationStatusCollection, err => {
+        this._mongoClient.createCollection(locationStatusCollection).then(() => {
+            this._locationStatusColl = this._mongoClient.collection(locationStatusCollection);
+            return cb();
+        }).catch(err => {
             // in case the collection already exists, we ignore the error
             if (err && err.codeName !== 'NamespaceExists') {
                 this._logger.error('Could not create mongo collection', {
@@ -78,8 +81,6 @@ class LocationStatusManager {
                 });
                 return cb(err);
             }
-            this._locationStatusColl = this._mongoClient.collection(locationStatusCollection);
-            return cb();
         });
     }
 

diff --git a/tests/functional/ingestion/IngestionReader.js b/tests/functional/ingestion/IngestionReader.js
@@ -112,16 +112,13 @@ describe('ingestion reader tests with mock', function fD() {
         const topic = testConfig.extensions.ingestion.topic;
         async.waterfall([
             next => {
-                MongoClient.connect(mongoUrl, {}, (err, client) => {
-                    if (err) {
-                        next(err);
-                    }
+                MongoClient.connect(mongoUrl, {}).then((client) => {
                     this.client = client;
                     this.db = this.client.db('metadata', {
                         ignoreUndefined: true,
                     });
                     next();
-                });
+                }).catch(next);
             },
             next => kafkaAdminClient.createTopic({
                     topic,
@@ -153,10 +150,10 @@ describe('ingestion reader tests with mock', function fD() {
                 consumer.subscribe([testConfig.extensions.ingestion.topic]);
                 setTimeout(next, 2000);
             },
-            next => this.db.createCollection('PENSIEVE', err => {
+            next => this.db.createCollection('PENSIEVE').catch((err) => {
                 assert.ifError(err);
                 return next();
-            }),
+            }).then(next),
             next => {
                 this.m = this.db.collection('PENSIEVE');
                 this.m.insertOne(dummyPensieveCredentials, {});