fkie_node_manager: force kill if kill_on_stop is defined
@@ -2436,13 +2436,14 @@ class MasterViewProxy(QWidget):
rospy.logwarn("Error while stop node '%s': %s", utf8(node.name), utf8(e))
finally:
socket.setdefaulttimeout(None)
- if not success:
- if node.pid and node.name != '/node_manager_daemon':
- rospy.loginfo("Try to kill process %d of the node: %s", node.pid, utf8(node.name))
# wait kill_on_stop is an integer
if hasattr(node, 'kill_on_stop') and isinstance(node.kill_on_stop, (int, float)):
time.sleep(float(node.kill_on_stop) / 1000.0)
nm.nmd().monitor.kill_process(node.pid, nmdurl.nmduri(node.masteruri))
+ elif not success:
+ if node.pid and node.name != '/node_manager_daemon':
+ rospy.loginfo("Try to kill process %d of the node: %s", node.pid, utf8(node.name))
+ nm.nmd().monitor.kill_process(node.pid, nmdurl.nmduri(node.masteruri))
elif isinstance(node, NodeItem) and node.is_ghost:
# since for ghost nodes no info is available, emit a signal to handle the
# stop message in other master_view_proxy
