[sr-dev] git:master:01060e98: Merge branch 'master' of github.com:kamailio/kamailio

Module: kamailio Branch: master Commit: 01060e983d3de5bf798c7f9725dcd85e23c6c3d5 URL: https://github.com/kamailio/kamailio/commit/01060e983d3de5bf798c7f9725dcd85… Author: Hugh Waite &lt;hugh.waite(a)xura.com&gt; Committer: Hugh Waite &lt;hugh.waite(a)xura.com&gt; Date: 2015-12-09T14:20:07Z Merge branch 'master' of github.com:kamailio/kamailio --- Modified: modules/db_mysql/km_dbase.c Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamdbctl --- Diff: https://github.com/kamailio/kamailio/commit/01060e983d3de5bf798c7f9725dcd85… Patch: https://github.com/kamailio/kamailio/commit/01060e983d3de5bf798c7f9725dcd85… --- diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index 9b220c3..2b3d1c9 100644 --- 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 index 22d9643..974f457 100755 --- 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 index e8915d1..224111b 100755 --- 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/