automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@9237 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-02-08 23:00:44 +00:00
parent f6d4da1706
commit 1c4e84f888
3 changed files with 17 additions and 5 deletions

View File

@@ -309,9 +309,18 @@ static void init_logger_chain(void)
cfg = ast_config_load("logger.conf");
/* If no config file, we're fine */
if (!cfg)
/* If no config file, we're fine, set default options. */
if (!cfg) {
fprintf(stderr, "Unable to open logger.conf: %s\n", strerror(errno));
chan = malloc(sizeof(struct logchannel));
memset(chan, 0, sizeof(struct logchannel));
chan->type = LOGTYPE_CONSOLE;
chan->logmask = 28; /*warning,notice,error */
chan->next = logchannels;
logchannels = chan;
global_logmask |= chan->logmask;
return;
}
ast_mutex_lock(&loglock);
if ((s = ast_variable_retrieve(cfg, "general", "appendhostname"))) {