From: Kevin P. Fleming <kpfleming@digium.com>
Date: Fri, 8 May 2009 14:03:28 +0000 (+0000)
Subject: Make absolute paths for logger channels work properly
X-Git-Tag: 1.4.25-rc1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58b5a85e80872278bf98409b9386dc1cd7dfb34c;p=thirdparty%2Fasterisk.git

Make absolute paths for logger channels work properly

(Note: This is not a new feature, it was previously undocumented and broken.)

The Asterisk logger has a feature to support absolute pathnames for logger channels, but the code implementing the feature was broken. This has been fixed, and the absolute path feature is now documented in the sample logger.conf.



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

diff --git a/configs/logger.conf.sample b/configs/logger.conf.sample
index f2ff0ea7eb..c28c302a82 100644
--- a/configs/logger.conf.sample
+++ b/configs/logger.conf.sample
@@ -46,6 +46,10 @@
 ;
 ; Special filename "console" represents the system console
 ;
+; Filenams can either be relative to the standard Asterisk log directory
+; (see 'astlogdir' in asterisk.conf), or absolute paths that begin with
+; '/'.
+;
 ; We highly recommend that you DO NOT turn on debug mode if you are simply
 ; running a production system.  Debug mode turns on a LOT of extra messages,
 ; most of which you are unlikely to understand without an understanding of
diff --git a/main/logger.c b/main/logger.c
index 0d1ef4b71f..e1913eed30 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -257,18 +257,12 @@ static struct logchannel *make_logchannel(char *channel, char *components, int l
 		snprintf(chan->filename, sizeof(chan->filename), "%s", channel);
 		openlog("asterisk", LOG_PID, chan->facility);
 	} else {
-		if (channel[0] == '/') {
-			if(!ast_strlen_zero(hostname)) { 
-				snprintf(chan->filename, sizeof(chan->filename) - 1,"%s.%s", channel, hostname);
-			} else {
-				ast_copy_string(chan->filename, channel, sizeof(chan->filename));
-			}
-		}		  
-		
-		if(!ast_strlen_zero(hostname)) {
-			snprintf(chan->filename, sizeof(chan->filename), "%s/%s.%s",(char *)ast_config_AST_LOG_DIR, channel, hostname);
+		if (!ast_strlen_zero(hostname)) {
+			snprintf(chan->filename, sizeof(chan->filename), "%s/%s.%s",
+				 channel[0] != '/' ? ast_config_AST_LOG_DIR : "", channel, hostname);
 		} else {
-			snprintf(chan->filename, sizeof(chan->filename), "%s/%s", (char *)ast_config_AST_LOG_DIR, channel);
+			snprintf(chan->filename, sizeof(chan->filename), "%s/%s",
+				 channel[0] != '/' ? ast_config_AST_LOG_DIR : "", channel);
 		}
 		chan->fileptr = fopen(chan->filename, "a");
 		if (!chan->fileptr) {