use updated function

Signed-off-by: Alejandro Hernández Cordero <[email protected]>
ros2 · Nov 5, 2024 · 925c3b1 · 925c3b1
1 parent 1679020
commit 925c3b1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 36 deletions.
diff --git a/rmw_zenoh_cpp/src/rmw_init.cpp b/rmw_zenoh_cpp/src/rmw_init.cpp
@@ -89,24 +89,9 @@ rmw_init(const rmw_init_options_t * options, rmw_context_t * context)
 
   // If not already defined, set the logging environment variable for Zenoh sessions
   // to warning level by default.
-  // TODO(Yadunund): Switch to rcutils_get_env once it supports not overwriting values.
-
-  const char * value;
-  const char * error_message = rcutils_get_env(ZENOH_LOG_ENV_VAR_STR, &value);
-  if (error_message != NULL) {
-    RMW_SET_ERROR_MSG_WITH_FORMAT_STRING(
-      "Error configuring Zenoh logging. Unable to get %s environment variable: %s",
-      ZENOH_LOG_ENV_VAR_STR,
-      error_message);
-    return RMW_RET_ERROR;
-  }
-  if (value == nullptr) {
-    if (!rcutils_set_env(ZENOH_LOG_ENV_VAR_STR, ZENOH_LOG_WARN_LEVEL_STR)) {
-      RMW_SET_ERROR_MSG_WITH_FORMAT_STRING(
-        "Error configuring Zenoh logging. Unable to set %s environment variable.",
-        ZENOH_LOG_ENV_VAR_STR);
-      return RMW_RET_ERROR;
-    }
+  if (!rcutils_set_env_overwrite(ZENOH_LOG_ENV_VAR_STR, ZENOH_LOG_WARN_LEVEL_STR, 0)) {
+    RMW_SET_ERROR_MSG("Error configuring Zenoh logging.");
+    return 1;
   }
 
   // Create the context impl.

diff --git a/rmw_zenoh_cpp/src/zenohd/main.cpp b/rmw_zenoh_cpp/src/zenohd/main.cpp
@@ -63,24 +63,9 @@ int main(int argc, char ** argv)
 
   // If not already defined, set the logging environment variable for Zenoh router
   // to info level by default.
-  // TODO(Yadunund): Switch to rcutils_get_env once it supports not overwriting values.
-
-  const char * value;
-  const char * error_message = rcutils_get_env(ZENOH_LOG_ENV_VAR_STR, &value);
-  if (error_message != NULL) {
-    RMW_SET_ERROR_MSG_WITH_FORMAT_STRING(
-      "Error configuring Zenoh logging. Unable to get %s environment variable: %s",
-      ZENOH_LOG_ENV_VAR_STR,
-      error_message);
-    return RMW_RET_ERROR;
-  }
-  if (value == nullptr) {
-    if (!rcutils_set_env(ZENOH_LOG_ENV_VAR_STR, ZENOH_LOG_INFO_LEVEL_STR)) {
-      RMW_SET_ERROR_MSG_WITH_FORMAT_STRING(
-        "Error configuring Zenoh logging. Unable to set %s environment variable.",
-        ZENOH_LOG_ENV_VAR_STR);
-      return RMW_RET_ERROR;
-    }
+  if (!rcutils_set_env_overwrite(ZENOH_LOG_ENV_VAR_STR, ZENOH_LOG_INFO_LEVEL_STR, 0)) {
+    RMW_SET_ERROR_MSG("Error configuring Zenoh logging.");
+    return 1;
   }
 
   // Initialize the zenoh configuration for the router.