From 09b67b26b03c946490c39dfc088146aa8eff9994 Mon Sep 17 00:00:00 2001
From: mr <mr>
Date: Fri, 2 Aug 2024 15:45:57 +0200
Subject: [PATCH] mongo and or

---
 dbs/mongo/mongo.go | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/dbs/mongo/mongo.go b/dbs/mongo/mongo.go
index a2636ce..8bb5cdd 100644
--- a/dbs/mongo/mongo.go
+++ b/dbs/mongo/mongo.go
@@ -62,30 +62,24 @@ func (m *MongoDB) createClient(MongoURL string) error {
 	defer cancel()
 
 	clientOptions := options.Client().ApplyURI(MongoURL).SetBSONOptions(bsonOpts)
-	mngoClient, err = mongo.Connect(MngoCtx, clientOptions)
-	if err != nil {
-		mngoClient = nil
-		isConnected = false
-		return errors.New("Mongodb NewClient " + MongoURL + ":" + err.Error())
-	}
-
 	// Ping the primary
-	if mngoClient, err = mongo.Connect(MngoCtx, clientOptions); err != nil {
+	if mngoClient, err = mongo.Connect(MngoCtx, clientOptions); err != nil || mngoClient == nil {
 		mngoClient = nil
 		isConnected = false
 		return errors.New("Mongodb connect " + MongoURL + ":" + err.Error())
 	}
 
-	if err = mngoClient.Ping(MngoCtx, nil); err != nil {
+	if err = mngoClient.Ping(MngoCtx, nil); err != nil || mngoClient == nil {
 		mngoClient = nil
 		isConnected = false
 		return errors.New("Mongodb ping " + MongoURL + ":" + err.Error())
 	}
-	if !isConnected {
+	if !isConnected && mngoClient != nil {
 		m.Logger.Info().Msg("Connecting mongo client to db " + mngoConfig.GetDatabase())
 		m.prepareDB(mngoCollections, mngoConfig)
 		m.Logger.Info().Msg("Database is READY")
 	}
+
 	return nil
 }