From 05c5005ed4b46f0beeb29ae36a323424b0fbe6fc Mon Sep 17 00:00:00 2001 From: "Felix Exner (fexner)" Date: Fri, 25 Oct 2024 15:18:23 +0200 Subject: [PATCH 1/2] Fix timeout value in std output (#1807) We were using the wrong timeout in the terminal output there. (cherry picked from commit cb91599f8f66aaf39b7485a2f7e131157f633474) # Conflicts: # controller_manager/controller_manager/controller_manager_services.py --- .../controller_manager/controller_manager_services.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/controller_manager/controller_manager/controller_manager_services.py b/controller_manager/controller_manager/controller_manager_services.py index dadb4d83ef..c0f35d4e83 100644 --- a/controller_manager/controller_manager/controller_manager_services.py +++ b/controller_manager/controller_manager/controller_manager_services.py @@ -105,8 +105,13 @@ def service_caller( rclpy.spin_until_future_complete(node, future, timeout_sec=call_timeout) if future.result() is None: node.get_logger().warning( +<<<<<<< HEAD f"Failed getting a result from calling {service_name} in " f"{service_timeout}. (Attempt {attempt+1} of {max_attempts}.)" +======= + f"Failed getting a result from calling {fully_qualified_service_name} in " + f"{call_timeout}. (Attempt {attempt+1} of {max_attempts}.)" +>>>>>>> cb91599 (Fix timeout value in std output (#1807)) ) else: return future.result() From 9ffd7a0b1da2d79024855fc0e40569a6db733f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Fri, 25 Oct 2024 15:25:00 +0200 Subject: [PATCH 2/2] Update controller_manager_services.py --- .../controller_manager/controller_manager_services.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/controller_manager/controller_manager/controller_manager_services.py b/controller_manager/controller_manager/controller_manager_services.py index c0f35d4e83..b7eb027fef 100644 --- a/controller_manager/controller_manager/controller_manager_services.py +++ b/controller_manager/controller_manager/controller_manager_services.py @@ -105,13 +105,8 @@ def service_caller( rclpy.spin_until_future_complete(node, future, timeout_sec=call_timeout) if future.result() is None: node.get_logger().warning( -<<<<<<< HEAD f"Failed getting a result from calling {service_name} in " - f"{service_timeout}. (Attempt {attempt+1} of {max_attempts}.)" -======= - f"Failed getting a result from calling {fully_qualified_service_name} in " f"{call_timeout}. (Attempt {attempt+1} of {max_attempts}.)" ->>>>>>> cb91599 (Fix timeout value in std output (#1807)) ) else: return future.result()