From 8bf8a6c786856dd28157d5b83205a9026f6fad1d Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 15:39:40 +0200 Subject: [PATCH] Fix timeout value in std output (backport #1807) (#1812) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 * Update controller_manager_services.py --------- Co-authored-by: Felix Exner (fexner) Co-authored-by: Christoph Fröhlich --- .../controller_manager/controller_manager_services.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controller_manager/controller_manager/controller_manager_services.py b/controller_manager/controller_manager/controller_manager_services.py index 25cd932dab..06abece354 100644 --- a/controller_manager/controller_manager/controller_manager_services.py +++ b/controller_manager/controller_manager/controller_manager_services.py @@ -106,7 +106,7 @@ def service_caller( if future.result() is None: node.get_logger().warning( f"Failed getting a result from calling {service_name} in " - f"{service_timeout}. (Attempt {attempt+1} of {max_attempts}.)" + f"{call_timeout}. (Attempt {attempt+1} of {max_attempts}.)" ) else: return future.result()