Add optional queue_log_name config option for logger.conf, to change the
authorJason Parker <jparker@digium.com>
Tue, 26 Sep 2006 17:09:01 +0000 (17:09 +0000)
committerJason Parker <jparker@digium.com>
Tue, 26 Sep 2006 17:09:01 +0000 (17:09 +0000)
name of the queue_log file.

Issue #7363, patch by Steve Davies, slightly modified by me.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43666 65c4cc65-6c06-0410-ace0-fbb531ad65f3

configs/logger.conf.sample
main/logger.c

index f2ff0ea..575d4d8 100644 (file)
 ; (defaults to yes).
 ;queue_log = no
 ;
+; Set the queue_log filename
+; (defaults to queue_log)
+;queue_log_name = queue_log
+;
 ; This determines whether or not we log generic events to a file
 ; (defaults to yes).
 ;event_log = no
index ec49d79..10534bd 100644 (file)
@@ -83,6 +83,8 @@ static int syslog_level_map[] = {
 
 static char dateformat[256] = "%b %e %T";              /* Original Asterisk Format */
 
+static char queue_log_name[256] = QUEUELOG;
+
 static int filesize_reload_needed = 0;
 static int global_logmask = -1;
 
@@ -336,6 +338,8 @@ static void init_logger_chain(void)
                logfiles.queue_log = ast_true(s);
        if ((s = ast_variable_retrieve(cfg, "general", "event_log")))
                logfiles.event_log = ast_true(s);
+       if ((s = ast_variable_retrieve(cfg, "general", "queue_log_name")))
+               ast_copy_string(queue_log_name, s, sizeof(queue_log_name));
 
        AST_LIST_LOCK(&logchannels);
        var = ast_variable_browse(cfg, "logfiles");
@@ -450,10 +454,10 @@ int reload_logger(int rotate)
        }
 
        if (logfiles.queue_log) {
-               snprintf(old, sizeof(old), "%s/%s", (char *)ast_config_AST_LOG_DIR, QUEUELOG);
+               snprintf(old, sizeof(old), "%s/%s", (char *)ast_config_AST_LOG_DIR, queue_log_name);
                if (queue_rotate) {
                        for (x = 0; ; x++) {
-                               snprintf(new, sizeof(new), "%s/%s.%d", (char *)ast_config_AST_LOG_DIR, QUEUELOG, x);
+                               snprintf(new, sizeof(new), "%s/%s.%d", (char *)ast_config_AST_LOG_DIR, queue_log_name, x);
                                myf = fopen((char *)new, "r");
                                if (myf)        /* File exists */
                                        fclose(myf);
@@ -610,7 +614,7 @@ int init_logger(void)
        }
 
        if (logfiles.queue_log) {
-               snprintf(tmp, sizeof(tmp), "%s/%s", (char *)ast_config_AST_LOG_DIR, QUEUELOG);
+               snprintf(tmp, sizeof(tmp), "%s/%s", (char *)ast_config_AST_LOG_DIR, queue_log_name);
                qlog = fopen(tmp, "a");
                ast_queue_log("NONE", "NONE", "NONE", "QUEUESTART", "%s", "");
        }