From 39487f6f9fceec5586703fa86b4281258765c881 Mon Sep 17 00:00:00 2001 From: john30 Date: Sun, 13 Mar 2016 14:00:16 +0100 Subject: [PATCH] report revision in config check and cleanup memory --- src/ebusd/main.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/ebusd/main.cpp b/src/ebusd/main.cpp index 428cd8c4..75b30181 100644 --- a/src/ebusd/main.cpp +++ b/src/ebusd/main.cpp @@ -871,7 +871,7 @@ int main(int argc, char* argv[]) s_messageMap = new MessageMap(opt.checkConfig && opt.scanConfig && arg_index >= argc); 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); @@ -903,13 +903,10 @@ int main(int argc, char* argv[]) logInfo(lf_main, "scan config %2.2x: file %s loaded", address, file.c_str()); } if (result == RESULT_OK && opt.checkConfig > 1) { - logNotice(lf_main, "Configuration dump:"); + logNotice(lf_main, "configuration dump:"); s_messageMap->dump(cout, true); } - delete s_messageMap; - s_messageMap = NULL; - globalTemplates.clear(); - + shutdown(); return 0; }