From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 22 Sep 2010 13:28:14 +0000 (-0500)
Subject: fix endless loop on startup when specifying -nosql
X-Git-Tag: v1.2-rc1~291^2~40^2~71
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b6a533ee9a6676e708325762661dc3560198c230;p=thirdparty%2Ffreeswitch.git

fix endless loop on startup when specifying -nosql
---

diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c
index c6b7f8d970..6bde9e53af 100644
--- a/src/switch_core_sqldb.c
+++ b/src/switch_core_sqldb.c
@@ -1539,6 +1539,7 @@ switch_status_t switch_core_sqldb_start(switch_memory_pool_t *pool, switch_bool_
 {
 	switch_threadattr_t *thd_attr;
 	switch_cache_db_handle_t *dbh;
+	uint32_t sanity = 400;
 
 	sql_manager.memory_pool = pool;
 	sql_manager.manage = manage;
@@ -1678,7 +1679,7 @@ switch_status_t switch_core_sqldb_start(switch_memory_pool_t *pool, switch_bool_
 	}
 	switch_thread_create(&sql_manager.db_thread, thd_attr, switch_core_sql_db_thread, NULL, sql_manager.memory_pool);
 
-	while (!sql_manager.thread_running) {
+	while (sql_manager.manage && !sql_manager.thread_running && --sanity) {
 		switch_yield(10000);
 	}