log: add boolean local variable logging_initialized.
This controls whether log_messages should write to the log file / syslog or rather to the log_message_storage. This will make the global processed_config_file variable from main unneccessary in the next step. Michael
This commit is contained in:
parent
649b2c0683
commit
891846f23e
@ -62,6 +62,8 @@ static int log_level = LOG_INFO;
|
|||||||
*/
|
*/
|
||||||
static vector_t log_message_storage;
|
static vector_t log_message_storage;
|
||||||
|
|
||||||
|
static unsigned int logging_initialized = FALSE; /* boolean */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Open the log file and store the file descriptor in a global location.
|
* Open the log file and store the file descriptor in a global location.
|
||||||
*/
|
*/
|
||||||
@ -137,7 +139,7 @@ void log_message (int level, const char *fmt, ...)
|
|||||||
* If the config file hasn't been processed, then we need to store
|
* If the config file hasn't been processed, then we need to store
|
||||||
* the messages for later processing.
|
* the messages for later processing.
|
||||||
*/
|
*/
|
||||||
if (!processed_config_file) {
|
if (!logging_initialized) {
|
||||||
char *entry_buffer;
|
char *entry_buffer;
|
||||||
|
|
||||||
if (!log_message_storage) {
|
if (!log_message_storage) {
|
||||||
@ -276,6 +278,7 @@ int setup_logging (void)
|
|||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logging_initialized = TRUE;
|
||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
||||||
done:
|
done:
|
||||||
@ -295,4 +298,6 @@ void shutdown_logging (void)
|
|||||||
fprintf (stderr, "error - shutdown_logging called while "
|
fprintf (stderr, "error - shutdown_logging called while "
|
||||||
" logging not configured yet\n");
|
" logging not configured yet\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logging_initialized = FALSE;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user