From 41b6e912954ea6123dd72f42b970474acde06302 Mon Sep 17 00:00:00 2001
From: john30 <ebusd@ebusd.eu>
Date: Sun, 8 Nov 2015 10:54:32 +0100
Subject: [PATCH] fix for reload with scanconfig

---
 src/ebusd/main.cpp | 8 ++++----
 src/ebusd/main.h   | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/ebusd/main.cpp b/src/ebusd/main.cpp
index 64f835de..fd3a65e0 100644
--- a/src/ebusd/main.cpp
+++ b/src/ebusd/main.cpp
@@ -574,7 +574,7 @@ static result_t readConfigFiles(const string path, const string extension, DataF
 	return RESULT_OK;
 };
 
-result_t loadConfigFiles(MessageMap* messages, bool recursive, bool verbose)
+result_t loadConfigFiles(MessageMap* messages, bool verbose)
 {
 	logInfo(lf_main, "loading configuration files from %s", opt.configPath);
 	string path = string(opt.configPath);
@@ -586,7 +586,7 @@ result_t loadConfigFiles(MessageMap* messages, bool recursive, bool verbose)
 	else
 		logError(lf_main, "error reading templates: %s, %s", getResultCode(result), globalTemplates.getLastError().c_str());
 
-	result = readConfigFiles(path, ".csv", &globalTemplates, messages, recursive, verbose);
+	result = readConfigFiles(path, ".csv", &globalTemplates, messages, !opt.scanConfig, verbose);
 	if (result == RESULT_OK)
 		logInfo(lf_main, "read config files");
 	else
@@ -801,7 +801,7 @@ int main(int argc, char* argv[])
 	if (opt.checkConfig) {
 		logNotice(lf_main, "Performing configuration check...");
 
-		result_t result = loadConfigFiles(&messages, !opt.scanConfig, true);
+		result_t result = loadConfigFiles(&messages, true);
 
 		if (result == RESULT_OK && opt.checkConfig > 1) {
 			logNotice(lf_main, "Configuration dump:");
@@ -833,7 +833,7 @@ int main(int argc, char* argv[])
 	logNotice(lf_main, PACKAGE_STRING " started");
 
 	// load configuration files
-	loadConfigFiles(&messages, !opt.scanConfig);
+	loadConfigFiles(&messages);
 	if (messages.sizeConditions()>0 && opt.pollInterval==0)
 		logError(lf_main, "conditions require a poll interval > 0");
 
diff --git a/src/ebusd/main.h b/src/ebusd/main.h
index 4294396d..ab73fb40 100644
--- a/src/ebusd/main.h
+++ b/src/ebusd/main.h
@@ -64,11 +64,10 @@ struct options
 /**
  * Load the message definitions from configuration files.
  * @param messages the @a MessageMap to load the messages into.
- * @param recursive whether to load all files recursively.
  * @param verbose whether to verbosely log problems.
  * @return the result code.
  */
-result_t loadConfigFiles(MessageMap* messages, bool recursive=true, bool verbose=false);
+result_t loadConfigFiles(MessageMap* messages, bool verbose=false);
 
 /**
  * Load the message definitions from a configuration file matching the scan result.