mirror of
https://github.com/pi-hole/FTL.git
synced 2024-10-26 16:52:18 +02:00
Fix GC removing too many queries from the in-memory database
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
@@ -607,7 +607,7 @@ bool delete_old_queries_from_db(const bool use_memdb, const double mintime)
|
||||
{
|
||||
// Get time stamp 24 hours (or what was configured) in the past
|
||||
bool okay = false;
|
||||
const char *querystr = "DELETE FROM query_storage WHERE timestamp >= ?";
|
||||
const char *querystr = "DELETE FROM query_storage WHERE timestamp <= ?";
|
||||
|
||||
sqlite3 *db = NULL;
|
||||
if(use_memdb)
|
||||
@@ -639,7 +639,10 @@ bool delete_old_queries_from_db(const bool use_memdb, const double mintime)
|
||||
mintime, sqlite3_errstr(rc));
|
||||
|
||||
// Update number of queries in in-memory database
|
||||
mem_db_num = get_number_of_queries_in_DB(memdb, "query_storage", false);
|
||||
const int new_num = get_number_of_queries_in_DB(memdb, "query_storage", false);
|
||||
log_debug(DEBUG_GC, "delete_old_queries_from_db(): Deleted %i (%u) queries, new number of queries in memory: %i",
|
||||
sqlite3_changes(db), (mem_db_num - new_num), new_num);
|
||||
mem_db_num = new_num;
|
||||
|
||||
// Finalize statement
|
||||
sqlite3_finalize(stmt);
|
||||
|
||||
@@ -783,7 +783,7 @@ bool flush_dnsmasq_log(void)
|
||||
unlock_shm();
|
||||
|
||||
// Flush last 24 hours of on-disk database
|
||||
const double mintime = double_time() - 86400.0;
|
||||
const double mintime = double_time();
|
||||
if(!delete_old_queries_from_db(false, mintime))
|
||||
{
|
||||
log_err("Could not flush on-disk database");
|
||||
|
||||
Reference in New Issue
Block a user