FIX -dbTimeout conflict with -dbURI

telefonicaid · Jan 30, 2024 · 5571604 · 5571604
1 parent 4e4d96f
commit 5571604
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/app/contextBroker/contextBroker.cpp b/src/app/contextBroker/contextBroker.cpp
@@ -309,8 +309,8 @@ PaArgument paArgs[] =
   { "-dbDisableRetryWrites",        &dbDisableRetryWrites,  "MONGO_DISABLE_RETRY_WRITES", PaBool, PaOpt, false,                           false, true,                  DBDISABLERETRYWRITES_DESC    },
 
   { "-db",                          dbName,                 "MONGO_DB",                 PaString, PaOpt, _i "orion",                      PaNL,  PaNL,                  DB_DESC                      },
-  { "-dbTimeout",                   &dbTimeout,             "MONGO_TIMEOUT",            PaULong,  PaOpt, 10000,                           0,     UINT_MAX,              DB_TMO_DESC                  },
-  { "-dbPoolSize",                  &dbPoolSize,            "MONGO_POOL_SIZE",          PaInt,    PaOpt, 10,                              1,     10000,                 DBPS_DESC                    },
+  { "-dbTimeout",                   &dbTimeout,             "MONGO_TIMEOUT",            PaULong,  PaOpt, -1,                              -1,    UINT_MAX,              DB_TMO_DESC                  },
+  { "-dbPoolSize",                  &dbPoolSize,            "MONGO_POOL_SIZE",          PaInt,    PaOpt, 10,                               1,    10000,                 DBPS_DESC                    },
 
   { "-ipv4",                        &useOnlyIPv4,           "USEIPV4",                  PaBool,   PaOpt, false,                           false, true,                  USEIPV4_DESC                 },
   { "-ipv6",                        &useOnlyIPv6,           "USEIPV6",                  PaBool,   PaOpt, false,                           false, true,                  USEIPV6_DESC                 },

diff --git a/src/lib/mongoDriver/mongoConnectionPool.cpp b/src/lib/mongoDriver/mongoConnectionPool.cpp
@@ -334,7 +334,7 @@ static std::string composeMongoUri
 
   if (strlen(dbURI) != 0)
   {
-    if (strlen(username) != 0 || strlen(authDb) != 0 || strlen(rplSet) != 0 || strlen(mechanism) != 0 || dbSSL || dbDisableRetryWrites || timeout > 0)
+    if (strlen(username) != 0 || strlen(authDb) != 0 || strlen(rplSet) != 0 || strlen(mechanism) != 0 || dbSSL || dbDisableRetryWrites || timeout > -1)
     {
         LM_X(1, ("Invalid Command Line Options: -dbURI cannot be combined with -dbhost, -rplSet, -dbTimeout, -dbuser, -dbAuthMech, -dbAuthDb, -dbSSL and -dbDisableRetryWrites"));
     }
@@ -399,14 +399,20 @@ static std::string composeMongoUri
       optionPrefix = "&";
     }
 
-    if (timeout > 0)
+    // Check if timeout is not zero (which means it's either unset or explicitly set to a positive value)
+    if (timeout != 0)
     {
-      char buf[STRING_SIZE_FOR_LONG];
-      i2s(timeout, buf, sizeof(buf));
-      uri += optionPrefix + "connectTimeoutMS=" + buf;
-      optionPrefix = "&";
+        // If timeout is negative (e.g., -1 indicating it's unset), set it to the default value of 10000
+        if (timeout < 0)
+        {
+            timeout = 10000;
+        }
+
+        char buf[STRING_SIZE_FOR_LONG];
+        i2s(timeout, buf, sizeof(buf));
+        uri += optionPrefix + "connectTimeoutMS=" + buf;
+        optionPrefix = "&";
     }
-  }
 
   LM_T(LmtMongo, ("MongoDB connection URI: '%s'", offuscatePassword(uri, passwd).c_str()));