Merge pull request #1168 from garaemon/verbose-connection-global-ns

[jsk_topic_tools/ConnectionBasedNodelet] Read `verbose_connection` as well as `~verbose_connection`
jsk-ros-pkg · Oct 11, 2015 · 856329e · 856329e
2 parents d61dffb + 5b7457f
commit 856329e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/jsk_topic_tools/include/jsk_topic_tools/connection_based_nodelet.h b/jsk_topic_tools/include/jsk_topic_tools/connection_based_nodelet.h
@@ -193,7 +193,7 @@ namespace jsk_topic_tools
     ConnectionStatus connection_status_;
 
     /** @brief
-     * true if `~verbose_connection` parameter is true.
+     * true if `~verbose_connection` or `verbose_connection` parameter is true.
      */
     bool verbose_connection_;
   private:

diff --git a/jsk_topic_tools/src/connection_based_nodelet.cpp b/jsk_topic_tools/src/connection_based_nodelet.cpp
@@ -45,6 +45,9 @@ namespace jsk_topic_tools
     pnh_.reset (new ros::NodeHandle (getMTPrivateNodeHandle ()));
     pnh_->param("always_subscribe", always_subscribe_, false);
     pnh_->param("verbose_connection", verbose_connection_, false);
+    if (!verbose_connection_) {
+      nh_->param("verbose_connection", verbose_connection_, false);
+    }
     // timer to warn when no connection in a few seconds
     ever_subscribed_ = false;
     timer_ = nh_->createWallTimer(