From 69fa2c8a190d64b29b8a463c46a527801da767a9 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Mon, 19 May 2008 16:05:25 +0000 Subject: [PATCH] Merged revisions 117085 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r117085 | file | 2008-05-19 13:03:33 -0300 (Mon, 19 May 2008) | 4 lines The logger closes the files it is logging to when reloading so we have to read in the logger configuration even if it has not changed so that the logs get opened again. (closes issue #12665) Reported by: DennisD ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@117087 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/logger.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/main/logger.c b/main/logger.c index 73cfb2338f..9fb415bf52 100644 --- a/main/logger.c +++ b/main/logger.c @@ -317,15 +317,15 @@ static struct logchannel *make_logchannel(const char *channel, const char *compo return chan; } -static void init_logger_chain(int reload, int locked) +static void init_logger_chain(int locked) { struct logchannel *chan; struct ast_config *cfg; struct ast_variable *var; const char *s; - struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; + struct ast_flags config_flags = { 0 }; - if ((cfg = ast_config_load("logger.conf", config_flags)) == CONFIG_STATUS_FILEUNCHANGED) + if (!(cfg = ast_config_load("logger.conf", config_flags))) return; /* delete our list of log channels */ @@ -592,7 +592,7 @@ static int reload_logger(int rotate) filesize_reload_needed = 0; - init_logger_chain(rotate ? 0 : 1 /* reload */, 1 /* locked */); + init_logger_chain(1 /* locked */); if (logfiles.event_log) { snprintf(old, sizeof(old), "%s/%s", ast_config_AST_LOG_DIR, EVENTLOG); @@ -927,7 +927,7 @@ int init_logger(void) ast_mkdir(ast_config_AST_LOG_DIR, 0777); /* create log channels */ - init_logger_chain(0 /* reload */, 0 /* locked */); + init_logger_chain(0 /* locked */); /* create the eventlog */ if (logfiles.event_log) {