[config] Improve error reporting on config URI parsing

Author: kostorr

src/CardConfigurator.cxx

@@ -39,8 +39,10 @@ CardConfigurator::CardConfigurator(Parameters::CardIdType cardId, std::string co
   }
   try {
     parseConfigUri(cardType, configUri, parameters);
-  } catch (...) {
-    throw;
+  } catch (const std::runtime_error& e) {
+    BOOST_THROW_EXCEPTION(e);
+  } catch (const Exception& e) {
+    BOOST_THROW_EXCEPTION(e);
   }
 
   auto bar2 = ChannelFactory().getBar(parameters);
@@ -267,8 +269,10 @@ void CardConfigurator::parseConfigUriCru(std::string configUri, Parameters& para
     parameters.setGbtMuxMap(gbtMuxMap);
     parameters.setFeeIdMap(feeIdMap);
 
-  } catch (...) {
-    BOOST_THROW_EXCEPTION(ParseException() << ErrorInfo::ConfigParse(group));
+  } catch (const std::runtime_error& e) {
+    BOOST_THROW_EXCEPTION(e);
+  } catch (const Exception& e) {
+    BOOST_THROW_EXCEPTION(e);
   }
 }
 

src/CommandLineUtilities/ProgramConfig.cxx

@@ -153,6 +153,8 @@ class ProgramConfig : public Program
           try {
             FirmwareChecker().checkFirmwareCompatibility(params);
             CardConfigurator(card.pciAddress, mOptions.configUri, mOptions.forceConfig);
+          } catch (const std::runtime_error& e) {
+            Logger::get() << e.what() << LogErrorOps << endm;
           } catch (const Exception& e) {
             Logger::get() << boost::diagnostic_information(e) << LogErrorOps << endm;
           }
@@ -242,6 +244,9 @@ class ProgramConfig : public Program
       Logger::get() << "Configuring with command line arguments" << LogDebugOps << endm;
       try {
         CardConfigurator(params, mOptions.forceConfig);
+      } catch (const std::runtime_error& e) {
+        Logger::get() << e.what() << LogErrorOps << endm;
+        throw;
       } catch (const Exception& e) {
         Logger::get() << e.what() << LogErrorOps << endm;
         throw;
@@ -250,7 +255,10 @@ class ProgramConfig : public Program
       Logger::get() << "Configuring with config uri" << LogDebugOps << endm;
       try {
         CardConfigurator(cardId, mOptions.configUri, mOptions.forceConfig);
-      } catch (std::exception& e) {
+      } catch (const std::runtime_error& e) {
+        Logger::get() << e.what() << LogErrorOps << endm;
+        throw;
+      } catch (const Exception& e) {
         Logger::get() << e.what() << LogErrorOps << endm;
         throw;
       }