Skip to content

Commit 7f96ad1

Browse files
saikishormergify[bot]
authored andcommitted
Use proper hardware component logger for async components (#2860)
(cherry picked from commit 38124b7)
1 parent 9e75bb0 commit 7f96ad1

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

hardware_interface/include/hardware_interface/hardware_component_interface.hpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,7 @@ class HardwareComponentInterface : public rclcpp_lifecycle::node_interfaces::Lif
129129
CallbackReturn init(const hardware_interface::HardwareComponentParams & params)
130130
{
131131
clock_ = params.clock;
132-
auto logger_copy = params.logger;
133-
logger_ = logger_copy.get_child(
134-
"hardware_component." + params.hardware_info.type + "." + params.hardware_info.name);
132+
logger_ = params.logger;
135133
info_ = params.hardware_info;
136134
if (params.hardware_info.is_async)
137135
{
@@ -141,7 +139,7 @@ class HardwareComponentInterface : public rclcpp_lifecycle::node_interfaces::Lif
141139
realtime_tools::AsyncSchedulingPolicy(info_.async_params.scheduling_policy);
142140
async_thread_params.cpu_affinity_cores = info_.async_params.cpu_affinity_cores;
143141
async_thread_params.clock = params.clock;
144-
async_thread_params.logger = params.logger;
142+
async_thread_params.logger = get_logger();
145143
async_thread_params.exec_rate = params.hardware_info.rw_rate;
146144
async_thread_params.print_warnings = info_.async_params.print_warnings;
147145
RCLCPP_INFO(

hardware_interface/src/resource_manager.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,9 @@ class ResourceStorage
250250
hardware_interface::HardwareComponentParams component_params;
251251
component_params.hardware_info = params.hardware_info;
252252
component_params.clock = rm_clock_;
253-
component_params.logger = rm_logger_;
253+
component_params.logger = rm_logger_.get_child(
254+
fmt::format(
255+
"hardware_component.{}.{}", params.hardware_info.type, params.hardware_info.name));
254256
component_params.executor = params.executor;
255257
component_params.node_namespace = params.node_namespace;
256258
RCLCPP_INFO(

0 commit comments

Comments
 (0)