Merge branch 'master' of github.com:kamailio/kamailio

kamailio · Dec 9, 2015 · 01060e9 · 01060e9
2 parents 3b6d7a2 + 5816e68
commit 01060e9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c
@@ -80,9 +80,13 @@ static int db_mysql_submit_query(const db1_con_t* _h, const str* _s)
 	if (my_ping_interval) {
 		t = time(0);
 		if ((t - CON_TIMESTAMP(_h)) > my_ping_interval) {
-			if (mysql_ping(CON_CONNECTION(_h))) {
-				LM_WARN("driver error on ping: %s\n", mysql_error(CON_CONNECTION(_h)));
-				counter_inc(mysql_cnts_h.driver_err);
+			for (i=0; i < (db_mysql_auto_reconnect ? 3 : 1); i++) {
+				if (mysql_ping(CON_CONNECTION(_h))) {
+					LM_WARN("driver error on ping: %s\n", mysql_error(CON_CONNECTION(_h)));
+					counter_inc(mysql_cnts_h.driver_err);
+				} else {
+					break;
+				}
 			}
 		}
 		/*

diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl
@@ -5,7 +5,7 @@
 #===================================================================
 
 ### version for this script
-VERSION='4.2.0'
+VERSION='4.4.0'
 
 PATH=$PATH:/usr/local/sbin/
 

diff --git a/utils/kamctl/kamdbctl b/utils/kamctl/kamdbctl
@@ -5,7 +5,7 @@
 #===================================================================
 
 ### version for this script
-VERSION='4.2.0'
+VERSION='4.4.0'
 
 PATH=$PATH:/usr/local/sbin/