From 45f871e261c22942ea7d685e03c6124bdbe27535 Mon Sep 17 00:00:00 2001
From: bijoua29 <73511637+bijoua29@users.noreply.github.com>
Date: Mon, 17 Feb 2025 08:06:39 -0800
Subject: [PATCH] Fix unused timeouts in load/unload controller (#2052)

---
 controller_manager/controller_manager/spawner.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/controller_manager/controller_manager/spawner.py b/controller_manager/controller_manager/spawner.py
index 58eb7be198..cbd8d6eaf9 100644
--- a/controller_manager/controller_manager/spawner.py
+++ b/controller_manager/controller_manager/spawner.py
@@ -229,7 +229,13 @@ def main(args=None):
                     ):
                         return 1
 
-                ret = load_controller(node, controller_manager_name, controller_name)
+                ret = load_controller(
+                    node,
+                    controller_manager_name,
+                    controller_name,
+                    controller_manager_timeout,
+                    service_call_timeout,
+                )
                 if not ret.ok:
                     node.get_logger().fatal(
                         bcolors.FAIL
@@ -338,7 +344,13 @@ def main(args=None):
 
             unload_status = True
             for controller_name in controller_names:
-                ret = unload_controller(node, controller_manager_name, controller_name)
+                ret = unload_controller(
+                    node,
+                    controller_manager_name,
+                    controller_name,
+                    controller_manager_timeout,
+                    service_call_timeout,
+                )
                 if not ret.ok:
                     unload_status = False
                     node.get_logger().error(