diff options
author | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-08 23:14:17 +0000 |
---|---|---|
committer | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-08 23:14:17 +0000 |
commit | 275ad97c10e1b5859ab093f1f26967e60d5b3ff4 (patch) | |
tree | 249311b44c8925e58502063381858cbdab987827 /logger.c | |
parent | 54a33238cc3d95c77bbc176bbf70253a8a6e2aed (diff) |
Merged revisions 9232 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.2
........
r9232 | mogorman | 2006-02-08 16:12:34 -0600 (Wed, 08 Feb 2006) | 4 lines
Make logger report error,warning,notice if logger.conf
not found, also updated chan_oss to give correct
error message if its config file is not found.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9239 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'logger.c')
-rw-r--r-- | logger.c | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -314,9 +314,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"))) { |