aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2011-01-05 18:54:58 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2011-01-05 18:54:58 +0000
commit1d15a6c895db878eb75888965e58fcc90d17f8ab (patch)
tree1b45868513df79e9fff07ec7dd14d5b6fd774140
parent5124dcd30dade66ae1c5bae21bc7831558e2dd14 (diff)
Merged revisions 300621 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r300621 | tilghman | 2011-01-05 12:47:46 -0600 (Wed, 05 Jan 2011) | 10 lines Use the sanity check in place of the disconnect/connect cycle. The disconnect/connect cycle has the potential to cause random crashes. (closes issue #18243) Reported by: ks3 Patches: res_odbc.patch uploaded by ks3 (license 1147) Tested by: ks3 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@300622 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--res/res_odbc.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/res/res_odbc.c b/res/res_odbc.c
index ac1cff75e..a75ed415f 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -578,12 +578,11 @@ SQLHSTMT ast_odbc_direct_execute(struct odbc_obj *obj, SQLHSTMT (*exec_cb)(struc
} else if (obj->tx) {
ast_log(LOG_WARNING, "Failed to execute, but unable to reconnect, as we're transactional.\n");
break;
- } else {
- obj->up = 0;
- ast_log(LOG_WARNING, "SQL Exec Direct failed. Attempting a reconnect...\n");
-
- odbc_obj_disconnect(obj);
- odbc_obj_connect(obj);
+ } else if (attempt == 0) {
+ ast_log(LOG_WARNING, "SQL Execute error! Verifying connection to %s [%s]...\n", obj->parent->name, obj->parent->dsn);
+ }
+ if (!ast_odbc_sanity_check(obj)) {
+ break;
}
}
@@ -625,7 +624,7 @@ SQLHSTMT ast_odbc_prepare_and_execute(struct odbc_obj *obj, SQLHSTMT (*prepare_c
ast_log(LOG_WARNING, "SQL Execute error, but unable to reconnect, as we're transactional.\n");
break;
} else {
- ast_log(LOG_WARNING, "SQL Execute error %d! Attempting a reconnect...\n", res);
+ ast_log(LOG_WARNING, "SQL Execute error %d! Verifying connection to %s [%s]...\n", res, obj->parent->name, obj->parent->dsn);
SQLFreeHandle(SQL_HANDLE_STMT, stmt);
stmt = NULL;
@@ -634,7 +633,9 @@ SQLHSTMT ast_odbc_prepare_and_execute(struct odbc_obj *obj, SQLHSTMT (*prepare_c
* While this isn't the best way to try to correct an error, this won't automatically
* fail when the statement handle invalidates.
*/
- ast_odbc_sanity_check(obj);
+ if (!ast_odbc_sanity_check(obj)) {
+ break;
+ }
continue;
}
} else {