Merge branch 'master' into hardening/4496_fix_env_var_logs

telefonicaid · Feb 7, 2024 · b30817d · b30817d
2 parents 6de8de1 + 2aa814d
commit b30817d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1 +1,2 @@
-- Fix: wrong INFO startup log showing ORION_MONGO_TIMEOUT, ORION_IN_REQ_PAYLOAD_MAX_SIZE and ORION_OUT_REQ_MSG_MAX_SIZE env var values (#4496)
+- Fix: changed the default value of `-dbTimeout` to 0 to resolve conflict with `-dbURI` (#4496) 
+- Fix: wrong INFO startup log showing ORION_MONGO_TIMEOUT, ORION_IN_REQ_PAYLOAD_MAX_SIZE and ORION_OUT_REQ_MSG_MAX_SIZE env var values (#4496)
diff --git a/src/app/contextBroker/contextBroker.cpp b/src/app/contextBroker/contextBroker.cpp
@@ -309,7 +309,7 @@ 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                  },
+  { "-dbTimeout",                   &dbTimeout,             "MONGO_TIMEOUT",            PaULong,  PaOpt, 0,                               0,     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                 },

diff --git a/src/lib/mongoDriver/mongoConnectionPool.cpp b/src/lib/mongoDriver/mongoConnectionPool.cpp
@@ -407,7 +407,7 @@ static std::string composeMongoUri
       optionPrefix = "&";
     }
   }
-
+  
   LM_T(LmtMongo, ("MongoDB connection URI: '%s'", offuscatePassword(uri, passwd).c_str()));
 
   return uri;

diff --git a/test/functionalTest/cases/3658_env_vars/env_vars.test b/test/functionalTest/cases/3658_env_vars/env_vars.test
@@ -95,7 +95,7 @@ Extended Usage: contextBroker  [option '-U' (extended usage)]
                                [option '-dbSSL' (enable SSL connection to DB)]                                     ORION_MONGO_SSL                    FALSE /FALSE/
                                [option '-dbDisableRetryWrites' (set retryWrite parameter to false in DB connect]   ORION_MONGO_DISABLE_RETRY_WRITES   FALSE /FALSE/
                                [option '-db' <database name>]                                                      ORION_MONGO_DB                     'orion' /'orion'/
-                               [option '-dbTimeout' <timeout in milliseconds for connections to the replica set]   ORION_MONGO_TIMEOUT                0 <= 10000 /10000/ <= 4294967295
+                               [option '-dbTimeout' <timeout in milliseconds for connections to the replica set]   ORION_MONGO_TIMEOUT                0 <= 0 /0/ <= 4294967295
                                [option '-dbPoolSize' <database connection pool size>]                              ORION_MONGO_POOL_SIZE              1 <= 10 /10/ <= 10000
                                [option '-ipv4' (use ip v4 only)]                                                   ORION_USEIPV4                      FALSE /FALSE/
                                [option '-ipv6' (use ip v6 only)]                                                   ORION_USEIPV6                      FALSE /FALSE/