mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-08 02:48:29 +00:00
Merged revisions 193194 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r193194 | kpfleming | 2009-05-08 09:06:15 -0500 (Fri, 08 May 2009) | 13 lines 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/branches/1.6.0@193195 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user