From 5033abe001885b8f206fcf9d03ebe3b227958357 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Wed, 18 Mar 2009 21:46:26 +0000 Subject: [PATCH] Revert the last commit as there's a better way. --- loadcfg.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/loadcfg.c b/loadcfg.c index aeb409bf..6282b314 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,4 +1,4 @@ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.91 2009/03/09 17:29:08 fabiankeil Exp $"; +const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.92 2009/03/18 20:43:19 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $ @@ -35,6 +35,11 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.91 2009/03/09 17:29:08 fabiankeil * * Revisions : * $Log: loadcfg.c,v $ + * Revision 1.92 2009/03/18 20:43:19 fabiankeil + * Don't enable LOG_LEVEL_INFO by default and don't apply the user's + * debug settings until the logfile has been opened (if there is one). + * Patch submitted by Roland in #2624120. + * * Revision 1.91 2009/03/09 17:29:08 fabiankeil * As of r1.88, the show-status page can use a single line for * warnings about ignored directives and the names of the ignored @@ -1775,6 +1780,8 @@ struct configuration_spec * load_config(void) fclose(configfp); + set_debug_level(config->debug); + freez(config->logfile); if (!no_daemon) @@ -1790,8 +1797,6 @@ struct configuration_spec * load_config(void) } } - set_debug_level(config->debug); - #ifdef FEATURE_CONNECTION_KEEP_ALIVE if (config->feature_flags & RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE) { -- 2.39.2