Thread is stucking on shutdown

Fixing the issue with 100% CPU usage after the shutdown ros#2238
l1va · Sep 27, 2022 · dc658fe · dc658fe
1 parent dd78ac8
commit dc658fe
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/tools/roslaunch/src/roslaunch/parent.py b/tools/roslaunch/src/roslaunch/parent.py
@@ -279,7 +279,12 @@ def _stop_infrastructure(self):
 
         if self.server:
             try:
-                self.server.shutdown("roslaunch parent complete")
+                import sys
+                if sys.version_info >= (3, 0):
+                    # https://github.com/ros/ros_comm/issues/2238
+                    self.server.shutdown()
+                else:
+                    self.server.shutdown("roslaunch parent complete")
             except:
                 # don't let exceptions halt the rest of the shutdown
                 pass