Skip to content

Commit b899b58

Browse files
committed
fix: make launch file sole source of truth for plugin enablement
- Default plugins to empty in YAML params (prevents loading with empty paths if launch resolution fails) - Always override plugins list from launch file (even when empty) Addresses PR review feedback.
1 parent 65e8d60 commit b899b58

7 files changed

Lines changed: 10 additions & 20 deletions

File tree

demos/moveit_pick_place/config/medkit_params.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@ diagnostics:
2626
runtime:
2727
create_synthetic_components: false # Manifest defines components
2828

29-
# Plugin configuration (paths set by launch file)
30-
plugins: ["graph_provider", "procfs_introspection"]
31-
plugins.graph_provider.path: ""
32-
plugins.procfs_introspection.path: ""
29+
# Plugin configuration (set by launch file when .so paths are resolved)
30+
plugins: [""]
3331

3432
# Fault Manager configuration (runs in root namespace)
3533
fault_manager:

demos/moveit_pick_place/launch/demo.launch.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ def generate_launch_description():
6464
if procfs_plugin_path:
6565
active_plugins.append('procfs_introspection')
6666
plugin_overrides['plugins.procfs_introspection.path'] = procfs_plugin_path
67-
if active_plugins:
68-
plugin_overrides['plugins'] = active_plugins
67+
plugin_overrides['plugins'] = active_plugins
6968

7069
# Launch configuration variables
7170
use_sim_time = LaunchConfiguration("use_sim_time", default="False")

demos/moveit_pick_place/launch/demo_gazebo.launch.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ def generate_launch_description():
8383
if procfs_plugin_path:
8484
active_plugins.append('procfs_introspection')
8585
plugin_overrides['plugins.procfs_introspection.path'] = procfs_plugin_path
86-
if active_plugins:
87-
plugin_overrides['plugins'] = active_plugins
86+
plugin_overrides['plugins'] = active_plugins
8887

8988
# Factory world file path
9089
factory_world = os.path.join(

demos/sensor_diagnostics/config/medkit_params.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,8 @@ diagnostics:
2424
runtime:
2525
create_synthetic_components: false # Manifest defines components
2626

27-
# Plugin configuration (paths set by launch file)
28-
plugins: ["graph_provider", "procfs_introspection"]
29-
plugins.graph_provider.path: ""
30-
plugins.procfs_introspection.path: ""
27+
# Plugin configuration (set by launch file when .so paths are resolved)
28+
plugins: [""]
3129

3230
# Fault Manager configuration (runs in root namespace)
3331
fault_manager:

demos/sensor_diagnostics/launch/demo.launch.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ def generate_launch_description():
6565
if procfs_plugin_path:
6666
active_plugins.append('procfs_introspection')
6767
plugin_overrides['plugins.procfs_introspection.path'] = procfs_plugin_path
68-
if active_plugins:
69-
plugin_overrides['plugins'] = active_plugins
68+
plugin_overrides['plugins'] = active_plugins
7069

7170
# Launch arguments
7271
use_sim_time = LaunchConfiguration("use_sim_time", default="false")

demos/turtlebot3_integration/config/medkit_params.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@ diagnostics:
2525
runtime:
2626
create_synthetic_components: false # Manifest defines components
2727

28-
# Plugin configuration (paths set by launch file)
29-
plugins: ["graph_provider", "procfs_introspection"]
30-
plugins.graph_provider.path: ""
31-
plugins.procfs_introspection.path: ""
28+
# Plugin configuration (set by launch file when .so paths are resolved)
29+
plugins: [""]
3230

3331
# Fault Manager configuration (runs in root namespace)
3432
fault_manager:

demos/turtlebot3_integration/launch/demo.launch.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ def generate_launch_description():
6666
if procfs_plugin_path:
6767
active_plugins.append('procfs_introspection')
6868
plugin_overrides['plugins.procfs_introspection.path'] = procfs_plugin_path
69-
if active_plugins:
70-
plugin_overrides['plugins'] = active_plugins
69+
plugin_overrides['plugins'] = active_plugins
7170

7271
# Gazebo world file
7372
world_file = os.path.join(turtlebot3_gazebo_dir, "worlds", "turtlebot3_world.world")

0 commit comments

Comments
 (0)