rosbridge_websocket: Stop websocket server if ROS shuts down (backport …

…#946) Signed-off-by: Brad Martin <brad.martin@merlinlabs.com>
RobotWebTools · Oct 3, 2024 · dc835f9 · dc835f9
1 parent 9f45b8e
commit dc835f9
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/rosbridge_server/scripts/rosbridge_websocket.py b/rosbridge_server/scripts/rosbridge_websocket.py
@@ -337,7 +337,13 @@ def main(args=None):
 
     executor = rclpy.executors.SingleThreadedExecutor()
     executor.add_node(node)
-    spin_callback = PeriodicCallback(lambda: executor.spin_once(timeout_sec=0.01), 1)
+
+    def spin_ros():
+        executor.spin_once(timeout_sec=0.01)
+        if not rclpy.ok():
+            shutdown_hook()
+
+    spin_callback = PeriodicCallback(spin_ros, 1)
     spin_callback.start()
     try:
         start_hook()