kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into v1.2.stable

This commit is contained in:
Ken Rice 2013-03-05 11:36:04 -06:00
parent 0ad8d51606 57d6495248
commit f8d62a6747
1 changed files with 3 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/switch_core_db.c
View File

@ -45,20 +45,6 @@ static void db_pick_path(const char *dbname, char *buf, switch_size_t size)
} }
} }
struct integrity_check_cb_arg {
int rows;
int ok;
};
/* pragma integrity_check returns a single row with the value "ok" if no errors are found */
static int integrity_check_cb(void *pArg, int argc, char **argv, char **columnNames)
{
struct integrity_check_cb_arg *cb_arg = (struct integrity_check_cb_arg *)pArg;
cb_arg->rows++;
cb_arg->ok = (0 == strcasecmp(argv[0], "ok"));
return 0;
}
SWITCH_DECLARE(int) switch_core_db_open(const char *filename, switch_core_db_t **ppDb) SWITCH_DECLARE(int) switch_core_db_open(const char *filename, switch_core_db_t **ppDb)
{ {
return sqlite3_open(filename, ppDb); return sqlite3_open(filename, ppDb);
@ -211,43 +197,14 @@ SWITCH_DECLARE(int) switch_core_db_load_extension(switch_core_db_t *db, const ch
SWITCH_DECLARE(switch_core_db_t *) switch_core_db_open_file(const char *filename) SWITCH_DECLARE(switch_core_db_t *) switch_core_db_open_file(const char *filename)
{ {
switch_core_db_t *db = NULL; switch_core_db_t *db;
char path[1024]; char path[1024];
int db_ret; int db_ret;
struct integrity_check_cb_arg cb_arg;
int i;
db_pick_path(filename, path, sizeof(path)); db_pick_path(filename, path, sizeof(path));
if ((db_ret = switch_core_db_open(path, &db)) != SQLITE_OK) {
for (i = 0; i < 2; i++) { goto end;
if ((db_ret = switch_core_db_open(path, &db)) != SQLITE_OK) {
goto end;
}
memset(&cb_arg, 0, sizeof(cb_arg));
if ((db_ret = switch_core_db_exec(db, "PRAGMA integrity_check;", integrity_check_cb, &cb_arg, NULL) != SQLITE_OK)) {
goto end;
}
if (cb_arg.ok && (1 == cb_arg.rows)) {
break;
} else if (0 == i) {
char *cpath = switch_mprintf("%s.%ld.cdb", path, (long) switch_epoch_time_now(NULL));
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SQLite integrity_check failed for [%s]. Deleting file and retrying\n", path);
switch_core_db_close(db);
rename(path, cpath);
free(cpath);
continue;
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SQLite integrity_check failed second time for [%s]\n", path);
switch_core_db_close(db);
db = NULL;
goto end;
}
} }
if ((db_ret = switch_core_db_exec(db, "PRAGMA synchronous=OFF;", NULL, NULL, NULL) != SQLITE_OK)) { if ((db_ret = switch_core_db_exec(db, "PRAGMA synchronous=OFF;", NULL, NULL, NULL) != SQLITE_OK)) {
goto end; goto end;
} }