summaryrefslogtreecommitdiff
path: root/main/db.c
diff options
context:
space:
mode:
authorIgor Goncharovskiy <igor.goncharovsky@gmail.com>2014-06-16 09:04:05 +0000
committerIgor Goncharovskiy <igor.goncharovsky@gmail.com>2014-06-16 09:04:05 +0000
commita1e0a5e4b07387bcc59afa7c0ab9f960a389ac15 (patch)
treeb32c92f6d58fb19eaa7af132f6ad3f2f7977cf34 /main/db.c
parent8313964d726d2f6f3397aff12c573588a11aaea0 (diff)
We have faced situation when using CDR and CEL by sqlite3 modules. With system having high load (~100 concurrent calls created by sipp) we found many cdr and cel records missed. There is special finction in sqlite3, that make able to fix this situation - sqlite3_wait_timeout, that also can replace awful code cdr_sqlite3 ad cel_sqlite3 modules. Also this function can be used for aastdb and res_config_sqlite3 to avoid missed writes to sqlite db.
#ASTERISK-23766 #close Reported by: Igor Goncharovsky Review: https://reviewboard.asterisk.org/r/3559/ ........ Merged revisions 416336 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 416337 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 416338 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@416339 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/db.c')
-rw-r--r--main/db.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/main/db.c b/main/db.c
index 94583d678..5a0f17434 100644
--- a/main/db.c
+++ b/main/db.c
@@ -257,6 +257,7 @@ static int db_open(void)
ast_mutex_unlock(&dblock);
return -1;
}
+
ast_mutex_unlock(&dblock);
return 0;
@@ -283,9 +284,8 @@ static int db_execute_sql(const char *sql, int (*callback)(void *, int, char **,
char *errmsg = NULL;
int res =0;
- sqlite3_exec(astdb, sql, callback, arg, &errmsg);
- if (errmsg) {
- ast_log(LOG_WARNING, "Error executing SQL: %s\n", errmsg);
+ if (sqlite3_exec(astdb, sql, callback, arg, &errmsg) != SQLITE_OK) {
+ ast_log(LOG_WARNING, "Error executing SQL (%s): %s\n", sql, errmsg);
sqlite3_free(errmsg);
res = -1;
}