Rename mysql.conf to app_mysql.conf, make module support both names
authorRussell Bryant <russell@russellbryant.com>
Tue, 30 Jun 2009 17:10:45 +0000 (17:10 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 30 Jun 2009 17:10:45 +0000 (17:10 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204419 65c4cc65-6c06-0410-ace0-fbb531ad65f3

addons/app_mysql.c
configs/app_mysql.conf.sample [moved from configs/mysql.conf.sample with 100% similarity]

index db33c11..3bc027b 100644 (file)
@@ -92,7 +92,8 @@ exten => s,9,MYSQL(Disconnect ${connid})
 
 AST_MUTEX_DEFINE_STATIC(_mysql_mutex);
 
-#define MYSQL_CONFIG "mysql.conf"
+#define MYSQL_CONFIG "app_mysql.conf"
+#define MYSQL_CONFIG_OLD "mysql.conf"
 #define AST_MYSQL_ID_DUMMY   0
 #define AST_MYSQL_ID_CONNID  1
 #define AST_MYSQL_ID_RESID   2
@@ -586,6 +587,11 @@ static int load_module(void)
        struct ast_config *cfg = ast_config_load(MYSQL_CONFIG, config_flags);
        const char *temp;
 
+       if (!cfg) {
+               /* Backwards compatibility ftw */
+               cfg = ast_config_load(MYSQL_CONFIG_OLD, config_flags);
+       }
+
        if (cfg) {
                if ((temp = ast_variable_retrieve(cfg, "general", "nullvalue"))) {
                        if (!strcasecmp(temp, "nullstring")) {