From: Adam Dickmeiss Date: Mon, 19 Oct 2015 09:51:18 +0000 (+0200) Subject: Destroy configuration at exit from main X-Git-Tag: v1.12.5~2 X-Git-Url: http://jira.indexdata.com/?a=commitdiff_plain;h=269732c92b0b57beb504c7b107e3559cd153b7c3;p=pazpar2-moved-to-github.git Destroy configuration at exit from main --- diff --git a/src/pazpar2.c b/src/pazpar2.c index 0dced81..0db4a4f 100644 --- a/src/pazpar2.c +++ b/src/pazpar2.c @@ -234,6 +234,7 @@ static int sc_main( if (!config) return 1; sc_stop_config = config; + ret = 0; if (test_mode) { yaz_log(YLOG_LOG, "Configuration OK"); @@ -241,7 +242,6 @@ static int sc_main( } else { - ret = 0; if (daemon && !log_file_in_use) { yaz_log(YLOG_FATAL, "Logfile must be given (option -l) for daemon " @@ -261,9 +261,9 @@ static int sc_main( pidfile, uid); } yaz_log(YLOG_LOG, "Pazpar2 stop"); - return ret; } - return 0; + config_destroy(config); + return ret; }