[Nagios-checkins] SF.net SVN: nagios:[2698] nagioscore/trunk/base/config.c

[<ag...@us...>]

Revision: 2698
          http://nagios.svn.sourceforge.net/nagios/?rev=2698&view=rev
Author:   ageric
Date:     2013-03-22 15:43:53 +0000 (Fri, 22 Mar 2013)
Log Message:
-----------
core: Make sure configured logfile always trumps default one

Previously we could end up logging to the default location if we
had deprecated variables defined before we defined log_file (which
caused us to write to the log_file set as default at compile time),
but the logging api is clever enough to keep that file open and
won't reopen it unnecessarily.

With this patch, we always close the log_file whenever we run into
the log_file statement, which causes the logging api to reopen it
with the new (and correct) path whenever we want to log something
again.

Signed-off-by: Andreas Ericsson <ae...@op...>

Modified Paths:
--------------
    nagioscore/trunk/base/config.c

Modified: nagioscore/trunk/base/config.c
===================================================================
--- nagioscore/trunk/base/config.c	2013-03-22 13:29:38 UTC (rev 2697)
+++ nagioscore/trunk/base/config.c	2013-03-22 15:43:53 UTC (rev 2698)
@@ -185,6 +185,8 @@
 
 			my_free(log_file);
 			log_file = nspath_absolute(value, config_file_dir);
+			/* make sure the configured logfile takes effect */
+			close_log_file();
 			}
 		else if(!strcmp(variable, "debug_level"))
 			debug_level = atoi(value);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.