Refs #22627: Distinguish Log error if the EASY_MODE IP conflicts with…

… a previous one Signed-off-by: Mario Dominguez <[email protected]>
eProsima · Jan 16, 2025 · d495f7f · d495f7f
1 parent e2c2479
commit d495f7f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/cpp/rtps/RTPSDomain.cpp b/src/cpp/rtps/RTPSDomain.cpp
@@ -614,9 +614,20 @@ RTPSParticipant* RTPSDomainImpl::clientServerEnvironmentCreationOverride(
                         .value(std::to_string(domain_id))
                         .value(easy_mode_env_value + ":" + std::to_string(domain_id))
                         .build_and_call();
-        if (res != 0)
+
+        // Python subprocess multiplies by 256 the result code
+        res /= 256;
+
+        if (res != SystemCommandBuilder::SystemCommandResult::SUCCESS)
         {
-            EPROSIMA_LOG_ERROR(DOMAIN, "Auto discovery server client setup. Unable to spawn daemon.");
+            if (res == SystemCommandBuilder::SystemCommandResult::BAD_PARAM)
+            {
+                EPROSIMA_LOG_ERROR(DOMAIN, "EASY_MODE IP connection conflicts with a previous one.");
+            }
+            else
+            {
+                EPROSIMA_LOG_ERROR(DOMAIN, "Auto discovery server client setup. Unable to spawn daemon.");
+            }
             return nullptr;
         }
     }

diff --git a/src/cpp/utils/SystemCommandBuilder.hpp b/src/cpp/utils/SystemCommandBuilder.hpp
@@ -33,6 +33,14 @@ class SystemCommandBuilder
 {
 public:
 
+    enum SystemCommandResult
+    {
+        SUCCESS = 0,
+        FAILURE,
+        BAD_PARAM,
+        INVALID
+    };
+
     SystemCommandBuilder() = default;
 
     SystemCommandBuilder& executable(