Skip to content

Commit e96314b

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

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
@@ -147,9 +147,7 @@ class HardwareComponentInterface : public rclcpp_lifecycle::node_interfaces::Lif
147147
CallbackReturn init(const hardware_interface::HardwareComponentParams & params)
148148
{
149149
clock_ = params.clock;
150-
auto logger_copy = params.logger;
151-
logger_ = logger_copy.get_child(
152-
"hardware_component." + params.hardware_info.type + "." + params.hardware_info.name);
150+
logger_ = params.logger;
153151
info_ = params.hardware_info;
154152
if (params.hardware_info.is_async)
155153
{
@@ -159,7 +157,7 @@ class HardwareComponentInterface : public rclcpp_lifecycle::node_interfaces::Lif
159157
realtime_tools::AsyncSchedulingPolicy(info_.async_params.scheduling_policy);
160158
async_thread_params.cpu_affinity_cores = info_.async_params.cpu_affinity_cores;
161159
async_thread_params.clock = params.clock;
162-
async_thread_params.logger = params.logger;
160+
async_thread_params.logger = get_logger();
163161
async_thread_params.exec_rate = params.hardware_info.rw_rate;
164162
async_thread_params.print_warnings = info_.async_params.print_warnings;
165163
RCLCPP_INFO(

hardware_interface/src/resource_manager.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,9 @@ class ResourceStorage
236236
hardware_interface::HardwareComponentParams component_params;
237237
component_params.hardware_info = params.hardware_info;
238238
component_params.clock = rm_clock_;
239-
component_params.logger = rm_logger_;
239+
component_params.logger = rm_logger_.get_child(
240+
fmt::format(
241+
"hardware_component.{}.{}", params.hardware_info.type, params.hardware_info.name));
240242
component_params.executor = params.executor;
241243
component_params.node_namespace = params.node_namespace;
242244
RCLCPP_INFO(

0 commit comments

Comments
 (0)