From: Andrey Volk <andywolk@gmail.com>
Date: Wed, 29 May 2019 19:06:22 +0000 (+0400)
Subject: FS-11866: [Core] FreeSWITCH Core no longer loads if database fails to connect.
X-Git-Tag: v1.8.6~1^2~52^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb470b2507b612c7fa40f391dba6873f521fee38;p=thirdparty%2Ffreeswitch.git

FS-11866: [Core] FreeSWITCH Core no longer loads if database fails to connect.
---

diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c
index 49a10e06c3..02e6897778 100644
--- a/src/switch_core_sqldb.c
+++ b/src/switch_core_sqldb.c
@@ -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;