Github
/
FTL
mirror of
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Open database only if we are going to perform actions 

Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2022-01-15 15:39:05 +01:00
parent 6440cada53
commit 118e3ee280
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/database/database-thread.c
View File

@ -47,7 +47,7 @@ static bool delete_old_queries_in_DB(sqlite3 *db)
return true;
}
#define DBOPEN_OR_AGAIN() { db = dbopen(false); if(db == NULL) { thread_sleepms(DB, 5000); continue; } }
#define DBOPEN_OR_AGAIN() { if(!db) db = dbopen(false); if(!db) { thread_sleepms(DB, 5000); continue; } }
#define BREAK_IF_KILLED() { if(killed) break; }
#define DBCLOSE_OR_BREAK() { dbclose(&db); BREAK_IF_KILLED(); }
@ -65,6 +65,7 @@ void *DB_thread(void *val)
// This thread runs until shutdown of the process. We keep this thread
// running when pihole-FTL.db is corrupted because reloading of privacy
// level, and the gravity database (initially and after gravity)
sqlite3 *db = NULL;
while(!killed)
{
const time_t now = time(NULL);
@ -81,15 +82,6 @@ void *DB_thread(void *val)
if(killed)
break;
// Open database connection
sqlite3 *db = dbopen(false);
if(db == NULL)
{
// Try again after 5 sec
thread_sleepms(DB, 5000);
continue;
}
// Store queries in on-disk database
if(now - lastDBsave >= (time_t)config.DBinterval)
{
@ -190,6 +182,10 @@ void *DB_thread(void *val)
thread_sleepms(DB, 1000);
}
// Close database handle if still open
if(db)
dbclose(&db);
log_info("Terminating database thread");
return NULL;
}