Merge branch 'develop' into hardening/own_lib_for_contextCache

FIWARE · May 11, 2021 · b4a9e13 · b4a9e13
2 parents 5d7d1c3 + 7863393
commit b4a9e13
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/src/lib/alarmMgr/AlarmManager.cpp b/src/lib/alarmMgr/AlarmManager.cpp
@@ -63,7 +63,8 @@ AlarmManager::AlarmManager()
   dbOk(true),
   notificationErrorLogAlways(false),
   badInputLogAlways(false),
-  dbErrorLogAlways(false)
+  dbErrorLogAlways(false),
+  stage(1)
 {
 }
 
@@ -78,8 +79,14 @@ int AlarmManager::init(bool logAlreadyRaisedAlarms)
   notificationErrorLogAlways = logAlreadyRaisedAlarms;
   badInputLogAlways          = logAlreadyRaisedAlarms;
   dbErrorLogAlways           = logAlreadyRaisedAlarms;
+  stage                      = 2;
 
-  return semInit();
+  bool b = semInit();
+
+  if (b == true)
+    stage = 3;
+
+  return b;
 }
 
 
@@ -193,6 +200,9 @@ void AlarmManager::dbErrorLogAlwaysSet(bool _dbErrorLogAlways)
 */
 bool AlarmManager::dbError(const std::string& details)
 {
+  if (stage < 3)
+    return false;
+
   if (dbOk == false)
   {
     if (dbErrorLogAlways)

diff --git a/src/lib/alarmMgr/AlarmManager.h b/src/lib/alarmMgr/AlarmManager.h
@@ -53,6 +53,7 @@ class AlarmManager
   bool                        badInputLogAlways;
   bool                        dbErrorLogAlways;
   sem_t                       sem;
+  int                         stage;
 
  public:
   AlarmManager();

diff --git a/src/lib/mongoBackend/mongoConnectionPool.cpp b/src/lib/mongoBackend/mongoConnectionPool.cpp
@@ -46,8 +46,8 @@
 * RECONNECT_RETRIES - number of retries after connect
 * RECONNECT_DELAY   - number of millisecs to sleep between retries
 */
-#define RECONNECT_RETRIES 100
-#define RECONNECT_DELAY   1000  // One second
+#define RECONNECT_RETRIES 20
+#define RECONNECT_DELAY   500  // milliseconds
 
 
 
@@ -147,7 +147,7 @@ static DBClientBase* mongoConnect
 
       if (tryNo == 0)
       {
-        LM_E(("Database Startup Error (cannot connect to mongo - doing %d retries with a %d microsecond interval)",
+        LM_E(("Database Startup Error (cannot connect to mongo - doing %d retries with a %d millisecond interval)",
               retries,
               RECONNECT_DELAY));
       }
@@ -156,7 +156,7 @@ static DBClientBase* mongoConnect
         LM_T(LmtMongo, ("Try %d connecting to mongo failed", tryNo));
       }
 
-      usleep(RECONNECT_DELAY * 1000);  // usleep accepts microseconds
+      usleep(RECONNECT_DELAY * 1000);  // usleep accepts microseconds, RECONNECT_DELAY is in millis
     }
   }
   else
@@ -190,7 +190,7 @@ static DBClientBase* mongoConnect
 
       if (tryNo == 0)
       {
-        LM_E(("Database Startup Error (cannot connect to mongo - doing %d retries with a %d microsecond interval)",
+        LM_E(("Database Startup Error (cannot connect to mongo - doing %d retries with a %d millisecond interval)",
               retries,
               RECONNECT_DELAY));
       }
@@ -199,7 +199,7 @@ static DBClientBase* mongoConnect
         LM_T(LmtMongo, ("Try %d connecting to mongo failed", tryNo));
       }
 
-      usleep(RECONNECT_DELAY * 1000);  // usleep accepts microseconds
+      usleep(RECONNECT_DELAY * 1000);  // usleep accepts microseconds, RECONNECT_DELAY is in millis
     }
   }
 
@@ -329,6 +329,9 @@ int mongoConnectionPoolInit
     connectionPool[ix].free       = true;
     connectionPool[ix].connection =
         mongoConnect(host, db, rplSet, username, passwd, multitenant, writeConcern, timeout);
+
+    if ((connectionPool[ix].connection == NULL) && (ix == 0))
+      LM_X(1, ("Database Error (unable connect to mongo after a number of retries)"));
   }
 
   //