diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2009-05-08 14:06:15 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2009-05-08 14:06:15 +0000 |
| commit | 7893ab8fe73732ff6d16389a3a56da53d1a0460a (patch) | |
| tree | b51587c7aa3bb5510b5d1e97a94b29dc625b0b7c /main | |
| parent | 9cd0a94aeb2387d9e78b3b34d460ca4ec3faaae5 (diff) | |
Merged revisions 193193 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r193193 | kpfleming | 2009-05-08 09:03:28 -0500 (Fri, 08 May 2009) | 7 lines
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/trunk@193194 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/logger.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/main/logger.c b/main/logger.c index 72411275d..bceaf092f 100644 --- a/main/logger.c +++ b/main/logger.c @@ -295,18 +295,12 @@ static struct logchannel *make_logchannel(const char *channel, const char *compo 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), "%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", ast_config_AST_LOG_DIR, channel, 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", 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) { |