@@ -453,15 +453,17 @@ void ControllerManager::add_hardware_command_forwarders()
453453 catch (const std::runtime_error & e)
454454 {
455455 RCLCPP_WARN_STREAM (
456- get_logger (), " ControllerManager: Can't create StatePublishers <"
456+ get_logger (), " ControllerManager: Can't create CommandForwarder <"
457457 << command_forwarder->command_interface_name () << " >." << e.what ());
458458 }
459459 }
460460}
461461
462462void ControllerManager::register_sub_controller_manager ()
463463{
464- RCLCPP_INFO (get_logger (), " SubControllerManager: Trying to register StatePublishers." );
464+ RCLCPP_INFO_STREAM (
465+ get_logger (),
466+ " SubControllerManager:<" << get_namespace () << " /" << get_name () << " > trying to register." );
465467 rclcpp::Client<controller_manager_msgs::srv::RegisterSubControllerManager>::SharedPtr client =
466468 create_client<controller_manager_msgs::srv::RegisterSubControllerManager>(
467469 " /register_sub_controller_manager" );
@@ -495,16 +497,18 @@ void ControllerManager::register_sub_controller_manager()
495497 {
496498 if (!rclcpp::ok ())
497499 {
498- RCLCPP_ERROR (
499- get_logger (),
500- " SubControllerManager: Interrupted while waiting for central controller managers "
501- " registration service. Exiting." );
500+ RCLCPP_ERROR_STREAM (
501+ get_logger (), " SubControllerManager:<"
502+ << get_namespace () << " /" << get_name ()
503+ << " >. Interrupted while waiting for central controller managers "
504+ " registration service. Exiting." );
502505 return ;
503506 }
504- RCLCPP_INFO (
505- get_logger (),
506- " SubControllerManager:Central controller managers registration service not available, "
507- " waiting again..." );
507+ RCLCPP_INFO_STREAM (
508+ get_logger (), " SubControllerManager:<"
509+ << get_namespace () << " /" << get_name ()
510+ << " >. Central controller managers registration service not available, "
511+ " waiting again..." );
508512 }
509513
510514 auto result = client->async_send_request (request);
@@ -532,23 +536,30 @@ void ControllerManager::register_sub_controller_manager()
532536 else
533537 {
534538 RCLCPP_WARN_STREAM (
535- get_logger (), " SubControllerManager: Could not find a CommandForwarder for key["
536- << key << " ]. No subscription to command state possible." );
539+ get_logger (), " SubControllerManager:<"
540+ << get_namespace () << " /" << get_name ()
541+ << " >. Could not find a CommandForwarder for key[" << key
542+ << " ]. No subscription to command state possible." );
537543 }
538544 }
539- RCLCPP_INFO (get_logger (), " SubControllerManager: Successfully registered StatePublishers." );
545+ RCLCPP_INFO_STREAM (
546+ get_logger (), " SubControllerManager:<" << get_namespace () << " /" << get_name ()
547+ << " >. Successfully registered." );
540548 }
541549 else
542550 {
543- RCLCPP_WARN (
544- get_logger (),
545- " SubControllerManager: Registration of StatePublishers failed. Central ControllerManager "
546- " returned error code." );
551+ RCLCPP_WARN_STREAM (
552+ get_logger (), " SubControllerManager: <"
553+ << get_namespace () << " /" << get_name ()
554+ << " >. Registration of StatePublishers failed. Central ControllerManager "
555+ " returned error code." );
547556 }
548557 }
549558 else
550559 {
551- RCLCPP_WARN (get_logger (), " SubControllerManager: Registration of StatePublishers failed." );
560+ RCLCPP_WARN_STREAM (
561+ get_logger (), " SubControllerManager: <" << get_namespace () << " /" << get_name ()
562+ << " >. Registration of StatePublishers failed." );
552563 }
553564}
554565
0 commit comments