kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 19:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename mysql.conf to app_mysql.conf, make module support both names

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204419 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-06-30 17:10:45 +00:00
parent 423fdaa324
commit 65317d3861
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
addons/app_mysql.c
View File

@@ -92,7 +92,8 @@ exten => s,9,MYSQL(Disconnect ${connid})
AST_MUTEX_DEFINE_STATIC(_mysql_mutex); 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_DUMMY 0
#define AST_MYSQL_ID_CONNID 1 #define AST_MYSQL_ID_CONNID 1
#define AST_MYSQL_ID_RESID 2 #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); struct ast_config *cfg = ast_config_load(MYSQL_CONFIG, config_flags);
const char *temp; const char *temp;
if (!cfg) {
/* Backwards compatibility ftw */
cfg = ast_config_load(MYSQL_CONFIG_OLD, config_flags);
}
if (cfg) { if (cfg) {
if ((temp = ast_variable_retrieve(cfg, "general", "nullvalue"))) { if ((temp = ast_variable_retrieve(cfg, "general", "nullvalue"))) {
if (!strcasecmp(temp, "nullstring")) { if (!strcasecmp(temp, "nullstring")) {

0
configs/mysql.conf.sample → configs/app_mysql.conf.sample
View File