Skip to content

Commit

Permalink
Fix timeout value in std output (#1807)
Browse files Browse the repository at this point in the history
We were using the wrong timeout in the terminal output there.

(cherry picked from commit cb91599)

# Conflicts:
#	controller_manager/controller_manager/controller_manager_services.py
  • Loading branch information
fmauch authored and mergify[bot] committed Oct 25, 2024
1 parent 1a1ce2f commit 05c5005
Showing 1 changed file with 5 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 05c5005

Please sign in to comment.