kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1805 in FS/freeswitch from bugfix/FS-11995-err-mod_fifo.c-4398-odbc-is-not-available to master 

* commit 'fd2f12cf94c4445843a299ef8b87ce2d15d77072':
  FS-11995: [mod_fifo, mod_directory] Fix database availability check.
This commit is contained in:
Andrey Volk 2019-08-27 10:06:12 -05:00
parent 6a6b8ac350 fd2f12cf94
commit 1583740133
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod/applications/mod_directory/mod_directory.c
View File

@ -468,10 +468,10 @@ static switch_status_t load_config(switch_bool_t reload)
char *val = (char *) switch_xml_attr_soft(param, "value"); char *val = (char *) switch_xml_attr_soft(param, "value");
if (!strcasecmp(var, "odbc-dsn") && !zstr(val)) { if (!strcasecmp(var, "odbc-dsn") && !zstr(val)) {
if (switch_database_available(val)) { if (switch_database_available(val) == SWITCH_STATUS_SUCCESS) {
switch_set_string(globals.odbc_dsn, val); switch_set_string(globals.odbc_dsn, val);
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ODBC IS NOT AVAILABLE!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "DATABASE IS NOT AVAILABLE!\n");
} }
} else if (!strcasecmp(var, "dbname") && !zstr(val)) { } else if (!strcasecmp(var, "dbname") && !zstr(val)) {
globals.dbname = switch_core_strdup(globals.pool, val); globals.dbname = switch_core_strdup(globals.pool, val);

4
src/mod/applications/mod_fifo/mod_fifo.c
View File

@ -4392,10 +4392,10 @@ static switch_status_t read_config_file(switch_xml_t *xml, switch_xml_t *cfg) {
if (!strcasecmp(var, "outbound-strategy") && !zstr(val)) { if (!strcasecmp(var, "outbound-strategy") && !zstr(val)) {
globals.default_strategy = parse_strategy(val); globals.default_strategy = parse_strategy(val);
} else if (!strcasecmp(var, "odbc-dsn") && !zstr(val)) { } else if (!strcasecmp(var, "odbc-dsn") && !zstr(val)) {
if (switch_database_available(val)) { if (switch_database_available(val) == SWITCH_STATUS_SUCCESS) {
switch_set_string(globals.odbc_dsn, val); switch_set_string(globals.odbc_dsn, val);
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ODBC IS NOT AVAILABLE!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "DATABASE IS NOT AVAILABLE!\n");
} }
} else if (!strcasecmp(var, "dbname") && !zstr(val)) { } else if (!strcasecmp(var, "dbname") && !zstr(val)) {
globals.dbname = switch_core_strdup(globals.pool, val); globals.dbname = switch_core_strdup(globals.pool, val);