diff --git a/common/component_interface_tools/launch/service_log_checker.launch.xml b/common/component_interface_tools/launch/service_log_checker.launch.xml index d131374da6e5c..9118cab0c3247 100644 --- a/common/component_interface_tools/launch/service_log_checker.launch.xml +++ b/common/component_interface_tools/launch/service_log_checker.launch.xml @@ -1,5 +1,5 @@ - + diff --git a/launch/tier4_control_launch/launch/control.launch.py b/launch/tier4_control_launch/launch/control.launch.py index 92c91d941f4a8..adb1c4c3e1651 100644 --- a/launch/tier4_control_launch/launch/control.launch.py +++ b/launch/tier4_control_launch/launch/control.launch.py @@ -336,16 +336,30 @@ def launch_setup(context, *args, **kwargs): plugin="GlogComponent", name="glog_component", ) - - log_args = ["--log-level", ["control.control_container:=", LaunchConfiguration("log_level")], - "--log-level", ["control.obstacle_collision_checker:=", LaunchConfiguration("log_level")], - "--log-level", ["control.autoware_operation_mode_transition_manager:=", LaunchConfiguration("log_level")], - "--log-level", ["control.vehicle_cmd_gate:=", LaunchConfiguration("log_level")], - "--log-level", ["control.predicted_path_checker:=", LaunchConfiguration("log_level")], - "--log-level", ["control.autonomous_emergency_braking:=", LaunchConfiguration("log_level")], - "--log-level", ["control.autoware_shift_decider:=", LaunchConfiguration("log_level")], - "--log-level", ["control.trajectory_follower.lane_departure_checker_node:=", LaunchConfiguration("log_level")], - "--log-level", ["control.trajectory_follower.controller_node_exe:=", LaunchConfiguration("log_level")],] + + log_args = [ + "--log-level", + ["control.control_container:=", LaunchConfiguration("log_level")], + "--log-level", + ["control.obstacle_collision_checker:=", LaunchConfiguration("log_level")], + "--log-level", + ["control.autoware_operation_mode_transition_manager:=", LaunchConfiguration("log_level")], + "--log-level", + ["control.vehicle_cmd_gate:=", LaunchConfiguration("log_level")], + "--log-level", + ["control.predicted_path_checker:=", LaunchConfiguration("log_level")], + "--log-level", + ["control.autonomous_emergency_braking:=", LaunchConfiguration("log_level")], + "--log-level", + ["control.autoware_shift_decider:=", LaunchConfiguration("log_level")], + "--log-level", + [ + "control.trajectory_follower.lane_departure_checker_node:=", + LaunchConfiguration("log_level"), + ], + "--log-level", + ["control.trajectory_follower.controller_node_exe:=", LaunchConfiguration("log_level")], + ] # set container to run all required components in the same process if trajectory_follower_mode == "trajectory_follower_node": @@ -449,8 +463,12 @@ def launch_setup(context, *args, **kwargs): name="glog_validator_component", ), ], - ros_arguments=["--log-level", ["control.control_validator_container:=", LaunchConfiguration("log_level")], - "--log-level", ["control.control_validator:=", LaunchConfiguration("log_level")]], + ros_arguments=[ + "--log-level", + ["control.control_validator_container:=", LaunchConfiguration("log_level")], + "--log-level", + ["control.control_validator:=", LaunchConfiguration("log_level")], + ], ), ] ) @@ -459,7 +477,7 @@ def launch_setup(context, *args, **kwargs): package="autoware_smart_mpc_trajectory_follower", executable="pympc_trajectory_follower.py", name="pympc_trajectory_follower", - arguments=["--ros-args", "--log-level", LaunchConfiguration("log_level")] + arguments=["--ros-args", "--log-level", LaunchConfiguration("log_level")], ) if trajectory_follower_mode == "trajectory_follower_node": return [group, control_validator_group] diff --git a/launch/tier4_map_launch/launch/map.launch.xml b/launch/tier4_map_launch/launch/map.launch.xml index bc0d9b860439c..cf876a650cfb6 100644 --- a/launch/tier4_map_launch/launch/map.launch.xml +++ b/launch/tier4_map_launch/launch/map.launch.xml @@ -24,12 +24,18 @@ - + --log-level map.vector_map_tf_generator:=$(var log_level)" + > diff --git a/launch/tier4_perception_launch/launch/traffic_light_recognition/traffic_light.launch.xml b/launch/tier4_perception_launch/launch/traffic_light_recognition/traffic_light.launch.xml index 60ce4b758102b..98100a6b06825 100644 --- a/launch/tier4_perception_launch/launch/traffic_light_recognition/traffic_light.launch.xml +++ b/launch/tier4_perception_launch/launch/traffic_light_recognition/traffic_light.launch.xml @@ -162,7 +162,13 @@ - + diff --git a/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml b/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml index 0a1af2510050a..c89d6877567fa 100644 --- a/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml +++ b/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml @@ -171,12 +171,19 @@ /> - + --log-level planning.scenario_planning.lane_driving.behavior_planning.vector_map_inside_area_filter_node:=$(var log_level)" + > diff --git a/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml b/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml index 5e702e9879832..73d3044dc7032 100644 --- a/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml +++ b/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml @@ -28,7 +28,13 @@ /> - + --log-level planning.scenario_planning.lane_driving.motion_planning.obstacle_stop_relay:=$(var log_level)" + > diff --git a/launch/tier4_planning_launch/launch/scenario_planning/parking.launch.xml b/launch/tier4_planning_launch/launch/scenario_planning/parking.launch.xml index 6311ec68f66cc..faa64c7e97b1c 100644 --- a/launch/tier4_planning_launch/launch/scenario_planning/parking.launch.xml +++ b/launch/tier4_planning_launch/launch/scenario_planning/parking.launch.xml @@ -5,10 +5,16 @@ - + --log-level planning.scenario_planning.parking.freespace_planner:=$(var log_level)" + > diff --git a/launch/tier4_planning_launch/launch/scenario_planning/scenario_planning.launch.xml b/launch/tier4_planning_launch/launch/scenario_planning/scenario_planning.launch.xml index a7787fcd2fbd9..90bda917b36fd 100644 --- a/launch/tier4_planning_launch/launch/scenario_planning/scenario_planning.launch.xml +++ b/launch/tier4_planning_launch/launch/scenario_planning/scenario_planning.launch.xml @@ -28,9 +28,14 @@ - + --log-level planning.scenario_planning.velocity_smoother:=$(var log_level)" + > diff --git a/perception/probabilistic_occupancy_grid_map/launch/laserscan_based_occupancy_grid_map.launch.py b/perception/probabilistic_occupancy_grid_map/launch/laserscan_based_occupancy_grid_map.launch.py index 0b1f7bf89307c..6203f83df5405 100644 --- a/perception/probabilistic_occupancy_grid_map/launch/laserscan_based_occupancy_grid_map.launch.py +++ b/perception/probabilistic_occupancy_grid_map/launch/laserscan_based_occupancy_grid_map.launch.py @@ -122,9 +122,14 @@ def launch_setup(context, *args, **kwargs): composable_node_descriptions=composable_nodes, condition=UnlessCondition(LaunchConfiguration("use_pointcloud_container")), output="screen", - ros_arguments=["--log-level", ["occupancy_grid_map.occupancy_grid_map_container:=", LaunchConfiguration("log_level")], - "--log-level", ["occupancy_grid_map.occupancy_grid_map_node:=", LaunchConfiguration("log_level")], - "--log-level", ["occupancy_grid_map.pointcloud_to_laserscan_node:=", LaunchConfiguration("log_level")],] + ros_arguments=[ + "--log-level", + ["occupancy_grid_map.occupancy_grid_map_container:=", LaunchConfiguration("log_level")], + "--log-level", + ["occupancy_grid_map.occupancy_grid_map_node:=", LaunchConfiguration("log_level")], + "--log-level", + ["occupancy_grid_map.pointcloud_to_laserscan_node:=", LaunchConfiguration("log_level")], + ], ) load_composable_nodes = LoadComposableNodes( diff --git a/perception/traffic_light_arbiter/launch/traffic_light_arbiter.launch.xml b/perception/traffic_light_arbiter/launch/traffic_light_arbiter.launch.xml index 3a64c33fef6c7..39ab4fe42d8e7 100644 --- a/perception/traffic_light_arbiter/launch/traffic_light_arbiter.launch.xml +++ b/perception/traffic_light_arbiter/launch/traffic_light_arbiter.launch.xml @@ -6,9 +6,14 @@ - + --log-level perception.traffic_light_recognition.traffic_light_arbiter.arbiter:=$(var log_level)" + > diff --git a/planning/autoware_mission_planner/launch/mission_planner.launch.xml b/planning/autoware_mission_planner/launch/mission_planner.launch.xml index ac1b07cdd828d..89227dfb17e8c 100644 --- a/planning/autoware_mission_planner/launch/mission_planner.launch.xml +++ b/planning/autoware_mission_planner/launch/mission_planner.launch.xml @@ -5,10 +5,15 @@ - + --log-level planning.mission_planning.route_selector:=$(var log_level)" + > diff --git a/planning/autoware_remaining_distance_time_calculator/launch/remaining_distance_time_calculator.launch.xml b/planning/autoware_remaining_distance_time_calculator/launch/remaining_distance_time_calculator.launch.xml index e6d072feae188..385a9b3a3d9ed 100644 --- a/planning/autoware_remaining_distance_time_calculator/launch/remaining_distance_time_calculator.launch.xml +++ b/planning/autoware_remaining_distance_time_calculator/launch/remaining_distance_time_calculator.launch.xml @@ -6,7 +6,13 @@ - + diff --git a/simulator/dummy_perception_publisher/launch/dummy_perception_publisher.launch.xml b/simulator/dummy_perception_publisher/launch/dummy_perception_publisher.launch.xml index f400658625479..340b674182169 100644 --- a/simulator/dummy_perception_publisher/launch/dummy_perception_publisher.launch.xml +++ b/simulator/dummy_perception_publisher/launch/dummy_perception_publisher.launch.xml @@ -31,7 +31,7 @@ - + diff --git a/simulator/vehicle_door_simulator/launch/vehicle_door_simulator.launch.xml b/simulator/vehicle_door_simulator/launch/vehicle_door_simulator.launch.xml index a497a4fccee81..696bd80a2f9c2 100644 --- a/simulator/vehicle_door_simulator/launch/vehicle_door_simulator.launch.xml +++ b/simulator/vehicle_door_simulator/launch/vehicle_door_simulator.launch.xml @@ -1,7 +1,7 @@ - + diff --git a/system/component_state_monitor/launch/component_state_monitor.launch.py b/system/component_state_monitor/launch/component_state_monitor.launch.py index ef81636129f61..87fce44b9b4f3 100644 --- a/system/component_state_monitor/launch/component_state_monitor.launch.py +++ b/system/component_state_monitor/launch/component_state_monitor.launch.py @@ -72,8 +72,12 @@ def launch_setup(context, *args, **kwargs): package="rclcpp_components", executable="component_container", composable_node_descriptions=[component], - ros_arguments=["--log-level", ["system.component_state_monitor.container:=" , LaunchConfiguration("log_level")], - "--log-level", ["system.component_state_monitor.component:=" , LaunchConfiguration("log_level")],], + ros_arguments=[ + "--log-level", + ["system.component_state_monitor.container:=", LaunchConfiguration("log_level")], + "--log-level", + ["system.component_state_monitor.component:=", LaunchConfiguration("log_level")], + ], ) return [container, *topic_monitor_nodes] diff --git a/system/default_ad_api/launch/default_ad_api.launch.py b/system/default_ad_api/launch/default_ad_api.launch.py index 5f016a16c83b4..10b91ceb8f560 100644 --- a/system/default_ad_api/launch/default_ad_api.launch.py +++ b/system/default_ad_api/launch/default_ad_api.launch.py @@ -61,21 +61,38 @@ def generate_launch_description(): name="container", package="rclcpp_components", executable="component_container_mt", - ros_arguments=["--log-level", ["default_ad_api.container:=", LaunchConfiguration("log_level")], - "--log-level", ["default_ad_api.autoware_state:=", LaunchConfiguration("log_level")], - "--log-level", ["default_ad_api.diagnostics:=", LaunchConfiguration("log_level")], - "--log-level", ["default_ad_api.fail_safe:=", LaunchConfiguration("log_level")], - "--log-level", ["default_ad_api.heartbeat:=", LaunchConfiguration("log_level")], - "--log-level", ["default_ad_api.interface:=", LaunchConfiguration("log_level")], - "--log-level", ["default_ad_api.localization:=", LaunchConfiguration("log_level")], - "--log-level", ["default_ad_api.motion:=", LaunchConfiguration("log_level")], - "--log-level", ["default_ad_api.operation_mode:=", LaunchConfiguration("log_level")], - "--log-level", ["default_ad_api.perception:=", LaunchConfiguration("log_level")], - "--log-level", ["default_ad_api.planning:=", LaunchConfiguration("log_level")], - "--log-level", ["default_ad_api.routing:=", LaunchConfiguration("log_level")], - "--log-level", ["default_ad_api.vehicle:=", LaunchConfiguration("log_level")], - "--log-level", ["default_ad_api.vehicle_info:=", LaunchConfiguration("log_level")], - "--log-level", ["default_ad_api.vehicle_door:=", LaunchConfiguration("log_level")],], + ros_arguments=[ + "--log-level", + ["default_ad_api.container:=", LaunchConfiguration("log_level")], + "--log-level", + ["default_ad_api.autoware_state:=", LaunchConfiguration("log_level")], + "--log-level", + ["default_ad_api.diagnostics:=", LaunchConfiguration("log_level")], + "--log-level", + ["default_ad_api.fail_safe:=", LaunchConfiguration("log_level")], + "--log-level", + ["default_ad_api.heartbeat:=", LaunchConfiguration("log_level")], + "--log-level", + ["default_ad_api.interface:=", LaunchConfiguration("log_level")], + "--log-level", + ["default_ad_api.localization:=", LaunchConfiguration("log_level")], + "--log-level", + ["default_ad_api.motion:=", LaunchConfiguration("log_level")], + "--log-level", + ["default_ad_api.operation_mode:=", LaunchConfiguration("log_level")], + "--log-level", + ["default_ad_api.perception:=", LaunchConfiguration("log_level")], + "--log-level", + ["default_ad_api.planning:=", LaunchConfiguration("log_level")], + "--log-level", + ["default_ad_api.routing:=", LaunchConfiguration("log_level")], + "--log-level", + ["default_ad_api.vehicle:=", LaunchConfiguration("log_level")], + "--log-level", + ["default_ad_api.vehicle_info:=", LaunchConfiguration("log_level")], + "--log-level", + ["default_ad_api.vehicle_door:=", LaunchConfiguration("log_level")], + ], composable_node_descriptions=components, ) web_server = Node( @@ -85,4 +102,6 @@ def generate_launch_description(): executable="web_server.py", ) argument = DeclareLaunchArgument("config", default_value=get_default_config()) - return launch.LaunchDescription([argument, DeclareLaunchArgument("log_level", default_value="WARN"), container, web_server]) + return launch.LaunchDescription( + [argument, DeclareLaunchArgument("log_level", default_value="WARN"), container, web_server] + ) diff --git a/system/diagnostic_graph_aggregator/launch/aggregator.launch.xml b/system/diagnostic_graph_aggregator/launch/aggregator.launch.xml index 08cb72f705c3a..56f86ac119c93 100644 --- a/system/diagnostic_graph_aggregator/launch/aggregator.launch.xml +++ b/system/diagnostic_graph_aggregator/launch/aggregator.launch.xml @@ -2,7 +2,7 @@ - + diff --git a/system/duplicated_node_checker/launch/duplicated_node_checker.launch.xml b/system/duplicated_node_checker/launch/duplicated_node_checker.launch.xml index 2dd30983d32c8..18d0ee2224da2 100644 --- a/system/duplicated_node_checker/launch/duplicated_node_checker.launch.xml +++ b/system/duplicated_node_checker/launch/duplicated_node_checker.launch.xml @@ -2,7 +2,7 @@ - + diff --git a/system/mrm_comfortable_stop_operator/launch/mrm_comfortable_stop_operator.launch.py b/system/mrm_comfortable_stop_operator/launch/mrm_comfortable_stop_operator.launch.py index 2850a44a1cb09..c52411efa1b3f 100644 --- a/system/mrm_comfortable_stop_operator/launch/mrm_comfortable_stop_operator.launch.py +++ b/system/mrm_comfortable_stop_operator/launch/mrm_comfortable_stop_operator.launch.py @@ -51,8 +51,18 @@ def launch_setup(context, *args, **kwargs): component, ], output="screen", - ros_arguments=["--log-level", ["system.mrm_comfortable_stop_operator.mrm_comfortable_stop_operator_container:=", LaunchConfiguration("log_level")], - "--log-level", ["system.mrm_comfortable_stop_operator.mrm_comfortable_stop_operator:=" , LaunchConfiguration("log_level")],], + ros_arguments=[ + "--log-level", + [ + "system.mrm_comfortable_stop_operator.mrm_comfortable_stop_operator_container:=", + LaunchConfiguration("log_level"), + ], + "--log-level", + [ + "system.mrm_comfortable_stop_operator.mrm_comfortable_stop_operator:=", + LaunchConfiguration("log_level"), + ], + ], ) return [container] diff --git a/system/mrm_emergency_stop_operator/launch/mrm_emergency_stop_operator.launch.py b/system/mrm_emergency_stop_operator/launch/mrm_emergency_stop_operator.launch.py index aa48239f334e4..991bc97b239c9 100644 --- a/system/mrm_emergency_stop_operator/launch/mrm_emergency_stop_operator.launch.py +++ b/system/mrm_emergency_stop_operator/launch/mrm_emergency_stop_operator.launch.py @@ -51,8 +51,18 @@ def launch_setup(context, *args, **kwargs): component, ], output="screen", - ros_arguments=["--log-level", ["system.mrm_emergency_stop_operator.mrm_emergency_stop_operator_container:=", LaunchConfiguration("log_level")], - "--log-level", ["system.mrm_emergency_stop_operator.mrm_emergency_stop_operator_container:=" , LaunchConfiguration("log_level")],], + ros_arguments=[ + "--log-level", + [ + "system.mrm_emergency_stop_operator.mrm_emergency_stop_operator_container:=", + LaunchConfiguration("log_level"), + ], + "--log-level", + [ + "system.mrm_emergency_stop_operator.mrm_emergency_stop_operator_container:=", + LaunchConfiguration("log_level"), + ], + ], ) return [container] diff --git a/system/system_monitor/launch/system_monitor.launch.xml b/system/system_monitor/launch/system_monitor.launch.xml index 122db0e394522..873ebc1b6020f 100644 --- a/system/system_monitor/launch/system_monitor.launch.xml +++ b/system/system_monitor/launch/system_monitor.launch.xml @@ -10,7 +10,12 @@ - + --log-level system_monitor.voltage_monitor:=$(var log_level)" + >