@@ -459,15 +459,17 @@ void ControllerManager::add_hardware_command_forwarders()
459459 catch (const std::runtime_error & e)
460460 {
461461 RCLCPP_WARN_STREAM (
462- get_logger (), " ControllerManager: Can't create StatePublishers <"
462+ get_logger (), " ControllerManager: Can't create CommandForwarder <"
463463 << command_forwarder->command_interface_name () << " >." << e.what ());
464464 }
465465 }
466466}
467467
468468void ControllerManager::register_sub_controller_manager ()
469469{
470- RCLCPP_INFO (get_logger (), " SubControllerManager: Trying to register StatePublishers." );
470+ RCLCPP_INFO_STREAM (
471+ get_logger (),
472+ " SubControllerManager:<" << get_namespace () << " /" << get_name () << " > trying to register." );
471473 rclcpp::Client<controller_manager_msgs::srv::RegisterSubControllerManager>::SharedPtr client =
472474 create_client<controller_manager_msgs::srv::RegisterSubControllerManager>(
473475 " /register_sub_controller_manager" );
@@ -501,16 +503,18 @@ void ControllerManager::register_sub_controller_manager()
501503 {
502504 if (!rclcpp::ok ())
503505 {
504- RCLCPP_ERROR (
505- get_logger (),
506- " SubControllerManager: Interrupted while waiting for central controller managers "
507- " registration service. Exiting." );
506+ RCLCPP_ERROR_STREAM (
507+ get_logger (), " SubControllerManager:<"
508+ << get_namespace () << " /" << get_name ()
509+ << " >. Interrupted while waiting for central controller managers "
510+ " registration service. Exiting." );
508511 return ;
509512 }
510- RCLCPP_INFO (
511- get_logger (),
512- " SubControllerManager:Central controller managers registration service not available, "
513- " waiting again..." );
513+ RCLCPP_INFO_STREAM (
514+ get_logger (), " SubControllerManager:<"
515+ << get_namespace () << " /" << get_name ()
516+ << " >. Central controller managers registration service not available, "
517+ " waiting again..." );
514518 }
515519
516520 auto result = client->async_send_request (request);
@@ -538,23 +542,30 @@ void ControllerManager::register_sub_controller_manager()
538542 else
539543 {
540544 RCLCPP_WARN_STREAM (
541- get_logger (), " SubControllerManager: Could not find a CommandForwarder for key["
542- << key << " ]. No subscription to command state possible." );
545+ get_logger (), " SubControllerManager:<"
546+ << get_namespace () << " /" << get_name ()
547+ << " >. Could not find a CommandForwarder for key[" << key
548+ << " ]. No subscription to command state possible." );
543549 }
544550 }
545- RCLCPP_INFO (get_logger (), " SubControllerManager: Successfully registered StatePublishers." );
551+ RCLCPP_INFO_STREAM (
552+ get_logger (), " SubControllerManager:<" << get_namespace () << " /" << get_name ()
553+ << " >. Successfully registered." );
546554 }
547555 else
548556 {
549- RCLCPP_WARN (
550- get_logger (),
551- " SubControllerManager: Registration of StatePublishers failed. Central ControllerManager "
552- " returned error code." );
557+ RCLCPP_WARN_STREAM (
558+ get_logger (), " SubControllerManager: <"
559+ << get_namespace () << " /" << get_name ()
560+ << " >. Registration of StatePublishers failed. Central ControllerManager "
561+ " returned error code." );
553562 }
554563 }
555564 else
556565 {
557- RCLCPP_WARN (get_logger (), " SubControllerManager: Registration of StatePublishers failed." );
566+ RCLCPP_WARN_STREAM (
567+ get_logger (), " SubControllerManager: <" << get_namespace () << " /" << get_name ()
568+ << " >. Registration of StatePublishers failed." );
558569 }
559570}
560571
0 commit comments