nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

report revision in config check and cleanup memory

Browse Source
This commit is contained in:
john30
2016-03-13 14:00:16 +01:00
parent 0981c15fbe
commit 39487f6f9f
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/main.cpp
+3 -6
View File
@@ -871,7 +871,7 @@ int main(int argc, char* argv[])
s_messageMap = new MessageMap(opt.checkConfig && opt.scanConfig && arg_index >= argc); s_messageMap = new MessageMap(opt.checkConfig && opt.scanConfig && arg_index >= argc);
if (opt.checkConfig) { if (opt.checkConfig) {
logNotice(lf_main, "Performing configuration check..."); logNotice(lf_main, PACKAGE_STRING "." REVISION " performing configuration check...");
result_t result = loadConfigFiles(s_messageMap, true, opt.scanConfig && arg_index < argc); result_t result = loadConfigFiles(s_messageMap, true, opt.scanConfig && arg_index < argc);
@@ -903,13 +903,10 @@ int main(int argc, char* argv[])
logInfo(lf_main, "scan config %2.2x: file %s loaded", address, file.c_str()); logInfo(lf_main, "scan config %2.2x: file %s loaded", address, file.c_str());
} }
if (result == RESULT_OK && opt.checkConfig > 1) { if (result == RESULT_OK && opt.checkConfig > 1) {
logNotice(lf_main, "Configuration dump:"); logNotice(lf_main, "configuration dump:");
s_messageMap->dump(cout, true); s_messageMap->dump(cout, true);
} }
delete s_messageMap; shutdown();
s_messageMap = NULL;
globalTemplates.clear();
return 0; return 0;
} }