diff options
| -rw-r--r-- | cdr/cdr_sqlite3_custom.c | 14 | ||||
| -rw-r--r-- | cel/cel_sqlite3_custom.c | 17 | ||||
| -rw-r--r-- | main/db.c | 6 | ||||
| -rw-r--r-- | res/res_config_sqlite3.c | 1 |
4 files changed, 9 insertions, 29 deletions
diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c index 435f4b37e..c33601e10 100644 --- a/cdr/cdr_sqlite3_custom.c +++ b/cdr/cdr_sqlite3_custom.c @@ -228,7 +228,6 @@ static int write_cdr(struct ast_cdr *cdr) int res = 0; char *error = NULL; char *sql = NULL; - int count = 0; if (db == NULL) { /* Should not have loaded, but be failsafe. */ @@ -264,16 +263,7 @@ static int write_cdr(struct ast_cdr *cdr) ast_free(value_string); } - /* XXX This seems awful arbitrary... */ - for (count = 0; count < 5; count++) { - res = sqlite3_exec(db, sql, NULL, NULL, &error); - if (res != SQLITE_BUSY && res != SQLITE_LOCKED) { - break; - } - usleep(200); - } - - if (error) { + if (sqlite3_exec(db, sql, NULL, NULL, &error) != SQLITE_OK) { ast_log(LOG_ERROR, "%s. SQL: %s.\n", error, sql); sqlite3_free(error); } @@ -317,7 +307,7 @@ static int load_module(void) free_config(0); return AST_MODULE_LOAD_DECLINE; } - + sqlite3_busy_timeout(db, 1000); /* is the table there? */ sql = sqlite3_mprintf("SELECT COUNT(AcctId) FROM %q;", table); res = sqlite3_exec(db, sql, NULL, NULL, NULL); diff --git a/cel/cel_sqlite3_custom.c b/cel/cel_sqlite3_custom.c index 8ff3bd702..110c8dc1c 100644 --- a/cel/cel_sqlite3_custom.c +++ b/cel/cel_sqlite3_custom.c @@ -234,7 +234,6 @@ static void write_cel(struct ast_event *event) { char *error = NULL; char *sql = NULL; - int count = 0; if (db == NULL) { /* Should not have loaded, but be failsafe. */ @@ -269,18 +268,7 @@ static void write_cel(struct ast_event *event) ast_free(value_string); } - /* XXX This seems awful arbitrary... */ - for (count = 0; count < 5; count++) { - int res = sqlite3_exec(db, sql, NULL, NULL, &error); - if (res != SQLITE_BUSY && res != SQLITE_LOCKED) { - break; - } - usleep(200); - } - - ast_mutex_unlock(&lock); - - if (error) { + if (sqlite3_exec(db, sql, NULL, NULL, &error) != SQLITE_OK) { ast_log(LOG_ERROR, "%s. SQL: %s.\n", error, sql); sqlite3_free(error); } @@ -288,6 +276,7 @@ static void write_cel(struct ast_event *event) if (sql) { sqlite3_free(sql); } + ast_mutex_unlock(&lock); return; } @@ -320,7 +309,7 @@ static int load_module(void) free_config(); return AST_MODULE_LOAD_DECLINE; } - + sqlite3_busy_timeout(db, 1000); /* is the table there? */ sql = sqlite3_mprintf("SELECT COUNT(*) FROM %q;", table); res = sqlite3_exec(db, sql, NULL, NULL, NULL); @@ -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; } diff --git a/res/res_config_sqlite3.c b/res/res_config_sqlite3.c index 0a4b1acac..6fa60386d 100644 --- a/res/res_config_sqlite3.c +++ b/res/res_config_sqlite3.c @@ -324,6 +324,7 @@ static int db_open(struct realtime_sqlite3_db *db) ao2_unlock(db); return -1; } + sqlite3_busy_timeout(db->handle, 1000); if (db->debug) { sqlite3_trace(db->handle, trace_cb, db); |