aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--channels/chan_oss.c3
-rw-r--r--logger.c13
2 files changed, 14 insertions, 2 deletions
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 858411de7..10c9767a6 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -1392,6 +1392,9 @@ int load_module(void)
store_config(cfg, ctg);
} while ( (ctg = ast_category_browse(cfg, ctg)) != NULL);
ast_config_destroy(cfg);
+ } else {
+ ast_log(LOG_NOTICE, "Unable to load config oss.conf\n");
+ return -1;
}
if (find_desc(oss_active) == NULL) {
ast_log(LOG_NOTICE, "Device %s not found\n", oss_active);
diff --git a/logger.c b/logger.c
index afdfa58d1..0ad5e3f9f 100644
--- a/logger.c
+++ b/logger.c
@@ -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"))) {