Improve exception handling

Signed-off-by: Alberto Tudela <[email protected]>

Author: ajtudela

scitos2_mira/src/mira_framework.cpp

@@ -37,6 +37,7 @@ MiraFramework::MiraFramework(const rclcpp::NodeOptions & options)
 
   // Redirect MIRA logger
   MIRA_LOGGER.registerSink(scitos2_core::SinkLogger(this->get_logger()));
+  MIRA_LOGGER.setSeverityLevel(mira::SeverityLevel::DEBUG);
 
   framework_ = std::make_unique<mira::Framework>(0, nullptr);
 }
@@ -52,7 +53,7 @@ MiraFramework::~MiraFramework()
   timer_.reset();
 }
 
-nav2_util::CallbackReturn MiraFramework::on_configure(const rclcpp_lifecycle::State &)
+nav2_util::CallbackReturn MiraFramework::on_configure(const rclcpp_lifecycle::State & state)
 {
   auto node = shared_from_this();
 
@@ -72,6 +73,7 @@ nav2_util::CallbackReturn MiraFramework::on_configure(const rclcpp_lifecycle::St
       loaded_ = true;
     } else {
       RCLCPP_ERROR(get_logger(), "Can't read parameter 'scitos_config'");
+      on_cleanup(state);
       return nav2_util::CallbackReturn::FAILURE;
     }
   } else {
@@ -119,6 +121,7 @@ nav2_util::CallbackReturn MiraFramework::on_configure(const rclcpp_lifecycle::St
       modules_.insert({module_ids_[i], module});
     } catch (const pluginlib::PluginlibException & ex) {
       RCLCPP_FATAL(get_logger(), "Failed to create module. Exception: %s", ex.what());
+      on_cleanup(state);
       return nav2_util::CallbackReturn::FAILURE;
     }
   }
@@ -128,8 +131,7 @@ nav2_util::CallbackReturn MiraFramework::on_configure(const rclcpp_lifecycle::St
   }
 
   RCLCPP_INFO(
-    get_logger(),
-    "MIRA framework has %s modules available.", module_ids_concat_.c_str());
+    get_logger(), "MIRA framework has %s modules available.", module_ids_concat_.c_str());
 
   // Create a publisher for diagnostics
   diag_pub_ = this->create_publisher<diagnostic_msgs::msg::DiagnosticArray>(
@@ -138,18 +140,30 @@ nav2_util::CallbackReturn MiraFramework::on_configure(const rclcpp_lifecycle::St
   return nav2_util::CallbackReturn::SUCCESS;
 }
 
-nav2_util::CallbackReturn MiraFramework::on_activate(const rclcpp_lifecycle::State & /*state*/)
+nav2_util::CallbackReturn MiraFramework::on_activate(const rclcpp_lifecycle::State & state)
 {
   RCLCPP_INFO(get_logger(), "Activating");
 
   // Activate the modules
   ModuleMap::iterator it;
   for (it = modules_.begin(); it != modules_.end(); ++it) {
-    it->second->activate();
+    try {
+      it->second->activate();
+    } catch (const std::exception & ex) {
+      RCLCPP_ERROR(get_logger(), "Failed to activate module. Exception: %s", ex.what());
+      on_deactivate(state);
+      return nav2_util::CallbackReturn::FAILURE;
+    }
   }
 
   // Start the MIRA framework
-  framework_->start();
+  try {
+    framework_->start();
+  } catch (const mira::Exception & ex) {
+    RCLCPP_ERROR(get_logger(), "Failed to start MIRA framework. Exception: %s", ex.what());
+    on_deactivate(state);
+    return nav2_util::CallbackReturn::FAILURE;
+  }
 
   // Create a timer to publish diagnostics
   timer_ = this->create_wall_timer(
@@ -192,7 +206,12 @@ nav2_util::CallbackReturn MiraFramework::on_cleanup(const rclcpp_lifecycle::Stat
   diag_pub_.reset();
   timer_.reset();
 
-  framework_->requestTermination();
+  try {
+    framework_->requestTermination();
+  } catch (const mira::Exception & ex) {
+    RCLCPP_ERROR(get_logger(), "Failed to request termination. Exception: %s", ex.what());
+    return nav2_util::CallbackReturn::FAILURE;
+  }
 
   return nav2_util::CallbackReturn::SUCCESS;
 }

scitos2_modules/src/charger.cpp

@@ -72,7 +72,13 @@ void Charger::activate()
     logger_, "Activating module : %s of type scitos2_module::Charger", plugin_name_.c_str());
   battery_pub_->on_activate();
   charger_pub_->on_activate();
-  authority_->start();
+
+  try {
+    authority_->start();
+  } catch (const mira::Exception & ex) {
+    RCLCPP_ERROR(logger_, "Failed to start scitos2_module::Charger. Exception: %s", ex.what());
+    return;
+  }
 }
 
 void Charger::deactivate()

scitos2_modules/src/display.cpp

@@ -107,7 +107,13 @@ void Display::activate()
   RCLCPP_INFO(
     logger_, "Activating module : %s of type scitos2_module::Display", plugin_name_.c_str());
   display_data_pub_->on_activate();
-  authority_->start();
+
+  try {
+    authority_->start();
+  } catch (const mira::Exception & ex) {
+    RCLCPP_ERROR(logger_, "Failed to start scitos2_module::Display. Exception: %s", ex.what());
+    return;
+  }
 }
 
 void Display::deactivate()

scitos2_modules/src/drive.cpp

@@ -227,8 +227,14 @@ void Drive::activate()
   mileage_pub_->on_activate();
   odometry_pub_->on_activate();
   rfid_pub_->on_activate();
-  authority_->start();
-  is_active_ = true;
+
+  try {
+    authority_->start();
+    is_active_ = true;
+  } catch (const mira::Exception & ex) {
+    RCLCPP_ERROR(logger_, "Failed to start scitos2_module::Drive. Exception: %s", ex.what());
+    return;
+  }
 }
 
 void Drive::deactivate()

scitos2_modules/src/ebc.cpp

@@ -274,7 +274,13 @@ void EBC::activate()
 {
   RCLCPP_INFO(
     logger_, "Activating module : %s of type scitos2_module::EBC", plugin_name_.c_str());
-  authority_->start();
+
+  try {
+    authority_->start();
+  } catch (const mira::Exception & ex) {
+    RCLCPP_ERROR(logger_, "Failed to start scitos2_module::EBC. Exception: %s", ex.what());
+    return;
+  }
 }
 
 void EBC::deactivate()

scitos2_modules/src/imu.cpp

@@ -83,7 +83,13 @@ void IMU::activate()
   RCLCPP_INFO(
     logger_, "Activating module : %s of type scitos2_module::IMU", plugin_name_.c_str());
   imu_pub_->on_activate();
-  authority_->start();
+
+  try {
+    authority_->start();
+  } catch (const mira::Exception & ex) {
+    RCLCPP_ERROR(logger_, "Failed to start scitos2_module::IMU. Exception: %s", ex.what());
+    return;
+  }
 }
 
 void IMU::deactivate()