Get logger name from rcl [indirect]

dhood · dhood · commit 88af1f2e3915 · 2018-01-23T14:46:26.000-08:00
diff --git a/rclcpp/include/rclcpp/node_interfaces/node_base.hpp b/rclcpp/include/rclcpp/node_interfaces/node_base.hpp
@@ -55,6 +55,11 @@ class NodeBase : public NodeBaseInterface
   const char *
   get_namespace() const;
 
+  RCLCPP_PUBLIC
+  virtual
+  const char *
+  get_logger_name() const;
+
   RCLCPP_PUBLIC
   virtual
   rclcpp::Context::SharedPtr
diff --git a/rclcpp/include/rclcpp/node_interfaces/node_base_interface.hpp b/rclcpp/include/rclcpp/node_interfaces/node_base_interface.hpp
@@ -52,6 +52,13 @@ class NodeBaseInterface
   const char *
   get_namespace() const = 0;
 
+  /// Return the logger name associated with the node.
+  /** \return The namespace of the node. */
+  RCLCPP_PUBLIC
+  virtual
+  const char *
+  get_logger_name() const = 0;
+
   /// Return the context of the node.
   /** \return SharedPtr to the node's context. */
   RCLCPP_PUBLIC
diff --git a/rclcpp/src/rclcpp/node_interfaces/node_base.cpp b/rclcpp/src/rclcpp/node_interfaces/node_base.cpp
@@ -185,6 +185,12 @@ NodeBase::get_namespace() const
   return rcl_node_get_namespace(node_handle_.get());
 }
 
+const char *
+NodeBase::get_logger_name() const
+{
+  return rcl_node_get_logger_name(node_handle_.get());
+}
+
 rclcpp::Context::SharedPtr
 NodeBase::get_context()
 {
diff --git a/rclcpp/src/rclcpp/node_interfaces/node_logging.cpp b/rclcpp/src/rclcpp/node_interfaces/node_logging.cpp
@@ -19,7 +19,7 @@ using rclcpp::node_interfaces::NodeLogging;
 NodeLogging::NodeLogging(rclcpp::node_interfaces::NodeBaseInterface * node_base)
 : node_base_(node_base)
 {
-  logger_ = rclcpp::get_logger(rcl_node_get_logger_name(node_base_->get_rcl_node_handle()));
+  logger_ = rclcpp::get_logger(node_base->get_logger_name());
 }
 
 NodeLogging::~NodeLogging()

Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,12 @@ NodeBase::get_namespace() const`
`185`	`185`	`return rcl_node_get_namespace(node_handle_.get());`
`186`	`186`	`}`
`187`	`187`
	`188`	`+const char *`
	`189`	`+NodeBase::get_logger_name() const`
	`190`	`+{`
	`191`	`+ return rcl_node_get_logger_name(node_handle_.get());`
	`192`	`+}`
	`193`	`+`
`188`	`194`	`rclcpp::Context::SharedPtr`
`189`	`195`	`NodeBase::get_context()`
`190`	`196`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ using rclcpp::node_interfaces::NodeLogging;`
`19`	`19`	`NodeLogging::NodeLogging(rclcpp::node_interfaces::NodeBaseInterface * node_base)`
`20`	`20`	`: node_base_(node_base)`
`21`	`21`	`{`
`22`		`- logger_ = rclcpp::get_logger(rcl_node_get_logger_name(node_base_->get_rcl_node_handle()));`
	`22`	`+ logger_ = rclcpp::get_logger(node_base->get_logger_name());`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`NodeLogging::~NodeLogging()`