diff options
| author | Russell Bryant <russell@russellbryant.com> | 2009-06-30 17:10:45 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2009-06-30 17:10:45 +0000 |
| commit | 65317d38610a8178ef70ca8ff6e5717b48cf3cfd (patch) | |
| tree | 91b4862866b3c5a08de1b8be356719cbeb2209b9 | |
| parent | 423fdaa324afbe9e1290335bafc572fa560cba8f (diff) | |
Rename mysql.conf to app_mysql.conf, make module support both names
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204419 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | addons/app_mysql.c | 8 | ||||
| -rw-r--r-- | configs/app_mysql.conf.sample (renamed from configs/mysql.conf.sample) | 0 |
2 files changed, 7 insertions, 1 deletions
diff --git a/addons/app_mysql.c b/addons/app_mysql.c index db33c11cb..3bc027b5e 100644 --- a/addons/app_mysql.c +++ b/addons/app_mysql.c @@ -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")) { diff --git a/configs/mysql.conf.sample b/configs/app_mysql.conf.sample index fafd4f7a2..fafd4f7a2 100644 --- a/configs/mysql.conf.sample +++ b/configs/app_mysql.conf.sample |