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

Merge pull request #1736 in FS/freeswitch from FS-11866-freeswitch-core-no-longer-loads-if-database-fails-to-connect to master 

* commit 'bb470b2507b612c7fa40f391dba6873f521fee38':
  FS-11866: [Core] FreeSWITCH Core no longer loads if database fails to connect.
This commit is contained in:
Andrey Volk 2019-05-29 14:30:32 -05:00
parent ddd69e3a2c bb470b2507
commit daae9fab32
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/switch_core_sqldb.c
View File

@ -3380,13 +3380,7 @@ switch_status_t switch_core_sqldb_start(switch_memory_pool_t *pool, switch_bool_
return SWITCH_STATUS_FALSE;
}
if (runtime.odbc_dsn) {
runtime.odbc_dsn = NULL;
runtime.odbc_dbtype = DBTYPE_DEFAULT;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Falling back to core_db.\n");
goto top;
}
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "CORE DATABASE INITIALIZATION FAILURE! CHECK `core-db-dsn`!\n");
switch_clear_flag((&runtime), SCF_USE_SQL);
return SWITCH_STATUS_FALSE;