Merged revisions 9232 via svnmerge from
authorMatt O'Gorman <mogorman@digium.com>
Wed, 8 Feb 2006 23:14:17 +0000 (23:14 +0000)
committerMatt O'Gorman <mogorman@digium.com>
Wed, 8 Feb 2006 23:14:17 +0000 (23:14 +0000)
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: https://origsvn.digium.com/svn/asterisk/trunk@9239 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_oss.c
logger.c

index 858411d..10c9767 100644 (file)
@@ -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);
index afdfa58..0ad5e3f 100644 (file)
--- 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"))) {