From 1b397ebd00ee04d3c572134cc4a08d184c09e5fb Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Wed, 17 Oct 2018 19:34:37 -0500
Subject: [PATCH] logger.c: Fix default console logging when no logger.conf
available.
Default logging was not setup correctly when there was no logger.conf.
This resulted in many expected log messages not actually getting out to
the console.
Change-Id: I542e61c03b2f630ff5327f9de5641d776c6fa70c
---
main/logger.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/main/logger.c b/main/logger.c
index 57e5857311..ff781b1044 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -621,7 +621,8 @@ static struct logchannel *make_logchannel(const char *channel, const char *compo
return chan;
}
-/* \brief Read config, setup channels.
+/*!
+ * \brief Read config, setup channels.
* \param altconf Alternate configuration file to read.
*
* \pre logchannels list is write locked
@@ -663,14 +664,11 @@ static int init_logger_chain(const char *altconf)
/* If no config file, we're fine, set default options. */
if (!cfg) {
- if (!(chan = ast_calloc(1, sizeof(*chan) + 1))) {
- fprintf(stderr, "Failed to initialize default logging\n");
+ chan = make_logchannel("console", "error,warning,notice,verbose", 0, 0);
+ if (!chan) {
+ fprintf(stderr, "ERROR: Failed to initialize default logging\n");
return -1;
}
- chan->type = LOGTYPE_CONSOLE;
- chan->logmask = (1 << __LOG_WARNING) | (1 << __LOG_NOTICE) | (1 << __LOG_ERROR)
- | (1 << __LOG_VERBOSE);
- memcpy(&chan->formatter, &logformatter_default, sizeof(chan->formatter));
AST_RWLIST_INSERT_HEAD(&logchannels, chan, list);
global_logmask |= chan->logmask;
@@ -738,7 +736,8 @@ static int init_logger_chain(const char *altconf)
var = ast_variable_browse(cfg, "logfiles");
for (; var; var = var->next) {
- if (!(chan = make_logchannel(var->name, var->value, var->lineno, 0))) {
+ chan = make_logchannel(var->name, var->value, var->lineno, 0);
+ if (!chan) {
/* Print error message directly to the consoles since the lock is held
* and we don't want to unlock with the list partially built */
ast_console_puts_mutable("ERROR: Unable to create log channel '", __LOG_ERROR);
--
GitLab