Quit more gracefully if configuration incomplete

Belongs to #15.

etc/scdaq/scdaq.conf

@@ -59,7 +59,7 @@ enable_stream_processor:yes
 # Note: When changing the processing type, change also "output_filename_prefix"
 # in the file output section.
 #
-#processor_type:GMT
+processor_type:
 
 # Enable software zero-supression
 doZS:yes
@@ -70,9 +70,9 @@ doZS:yes
 ##
 ################################################################################
 
-#output_filename_prefix:scout_GMT
+output_filename_prefix:
 
-#output_filename_base:/fff/BU0/ramdisk/scdaq
+output_filename_base:
 
 max_file_size:8589934592
 

scripts/runSCdaq.sh

@@ -15,6 +15,10 @@ while true
 do
     echo "Starting scdaq..."
     /opt/scdaq/bin/scdaq --config /etc/scdaq/scdaq.conf 2>&1
+    if [[ ${PIPESTATUS[0]} == 78 ]]; then # Numerical value of EX_CONFIG.
+      # If the configuration is incomplete there's no point in us retrying forever..
+      exit 1
+    fi
     echo "Resetting the board..."
     ../scripts/reset-firmware.sh
     echo "Clearing caches..."

src/config.cc

@@ -31,12 +31,15 @@ config::config(std::string filename){
     std::string key = line.substr(0, delim);
     std::string value = line.substr(delim + 1);
 
-    if (key.empty() || value.empty()) {
+    if (key.empty()) {
       // Skip ill formated lines
        continue;      
     }
 
-    //std::cout << "key: " << key << ", value: " << value << "\n";
+    if (value.empty()) {
+      LOG(ERROR) << "Configuration entry " << key << " has no value!";
+      valid_ &= false;
+    }
 
     vmap[key] = value;
   }
@@ -45,5 +48,8 @@ void config::print()const {
   for (std::map<std::string,std::string>::const_iterator it = vmap.begin(); it!=vmap.end(); it++){
     LOG(INFO) << "key " << it->first << " value " << it->second;
   }
+}
 
+bool config::valid() const {
+  return valid_;
 }

src/config.h

@@ -10,13 +10,15 @@
 
 class config{
 public:
-  
+
   enum class InputType { WZDMA, DMA, FILEDMA, MICRONDMA, FILE };
 
   config(std::string filename);
 
   void print() const;
 
+  bool valid() const;
+
   InputType getInput() const {
     const std::string& input = vmap.at("input");
     if (input == "wzdma") {
@@ -144,9 +146,10 @@ public:
     return boost::lexical_cast<uint32_t>(v.c_str());
   }
 private:
-  
+
   std::map<std::string,std::string> vmap;
-  
+  bool valid_ = true;
+
 
 };
 #endif

src/scdaq.cc

@@ -9,6 +9,7 @@
 #include <cctype>
 #include <string>
 #include <iostream>
+#include <sysexits.h>
 
 #include <boost/bind.hpp>
 #include <boost/asio.hpp>
@@ -147,6 +148,10 @@ if(argc < 2){
   try {
     config conf(argv[2]);
     conf.print();
+    if (!conf.valid()) {
+      LOG(ERROR) << "Configuration invalid! Bailing out.";
+      return EX_CONFIG;
+    }
     LOG(DEBUG) << "Configuration loaded";
     ctrl control;
     //    tbb::tick_count mainStartTime = tbb::tick_count::now();