From: Mark Spencer <markster@digium.com>
Date: Thu, 13 Nov 2003 16:25:52 +0000 (+0000)
Subject: Don't reconnect db on reload unless there was a failure
X-Git-Tag: 0.7.0~271
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d244cb4ce876e3276d48bd5d192d033342692a6;p=thirdparty%2Fasterisk.git

Don't reconnect db on reload unless there was a failure


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1741 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_iax.c b/channels/chan_iax.c
index 4b3b3c1c15..ce36153e7b 100755
--- a/channels/chan_iax.c
+++ b/channels/chan_iax.c
@@ -4932,7 +4932,7 @@ static int set_config(char *config_file, struct sockaddr_in* sin){
 	ast_destroy(cfg);
 #ifdef MYSQL_FRIENDS
 	/* Connect to db if appropriate */
-	if (strlen(mydbname)) {
+	if (!mysql && strlen(mydbname)) {
 		mysql = mysql_init(NULL);
 		if (!mysql_real_connect(mysql, mydbhost[0] ? mydbhost : NULL, mydbuser, mydbpass, mydbname, 0, NULL, 0)) {
 			memset(mydbpass, '*', strlen(mydbpass));
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 5c986cdbe6..d05e29c311 100755
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -5516,7 +5516,7 @@ static int set_config(char *config_file, struct sockaddr_in* sin){
 	set_timing();
 #ifdef MYSQL_FRIENDS
 	/* Connect to db if appropriate */
-	if (strlen(mydbname)) {
+	if (!mysql && strlen(mydbname)) {
 		mysql = mysql_init(NULL);
 		if (!mysql_real_connect(mysql, mydbhost[0] ? mydbhost : NULL, mydbuser, mydbpass, mydbname, 0, NULL, 0)) {
 			memset(mydbpass, '*', strlen(mydbpass));