Merge branch 'development' of gitlab.lrz.de:dcdb/dcdb into development

analytics/operators/smucngperf/SMUCNGPerfOperator.cpp

@@ -140,7 +140,7 @@ void SMUCNGPerfOperator::printConfig(LOG_LEVEL ll) {
 
 void SMUCNGPerfOperator::compute(U_Ptr unit) {
 	auto inputs = unit->getInputs();
-	auto timestamp = getTimestamp() - _go_back_ns;
+	auto timestamp = _scheduledTime - _go_back_ns;
 	for(auto& outSensor : unit->getOutputs()){
 		if(outSensor->getMetadata() == nullptr || !outSensor->getMetadata()->getScale()) {
 			LOG(error) << "No metadata defined, sensor " << outSensor->getName() <<  " can't compute anything.";

common/src/RESTHttpsServer.cpp

@@ -89,7 +89,8 @@ RESTHttpsServer::RESTHttpsServer(serverSettings_t settings) :
     } catch (const std::exception& e) {
         ServerLOG(fatal) << "Could not load certificate OR private key settings file! "
                             "Please ensure the paths in the config file are valid!";
-        throw;
+        std::runtime_error re("RESTAPI config error");
+        throw re;
     }
 		
     // 2048bit Diffie-Hellman parameters from RFC3526
@@ -107,7 +108,8 @@ RESTHttpsServer::RESTHttpsServer(serverSettings_t settings) :
         _acceptor->set_option(tcp::acceptor::reuse_address(true));
     } catch (const std::exception& e) {
         ServerLOG(fatal) << "RestAPI address invalid! Please make sure IP address and port are valid!";
-        throw;
+        std::runtime_error re("RESTAPI config error");
+        throw re;
     }
 }