pi-hole/FTL
1
0
Fork 0
mirror of https://github.com/pi-hole/FTL.git synced 2024-10-26 16:52:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Close database on any erros to ensure nothing stays locked.

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2020-05-26 20:18:44 +02:00
parent 0b92f53dde
commit 5ccc18fbc1
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/database/message-table.c
+21 -19
View File
@@ -102,6 +102,8 @@ static bool add_message(enum message_type type, const char *message,
if( rc != SQLITE_OK ){
logg("add_message(type=%u, message=%s) - SQL error prepare DELETE: %s",
type, message, sqlite3_errstr(rc));
if(opened_database)
dbclose();
return false;
}
@@ -112,6 +114,8 @@ static bool add_message(enum message_type type, const char *message,
type, message, sqlite3_errstr(rc));
sqlite3_reset(stmt);
sqlite3_finalize(stmt);
if(opened_database)
dbclose();
return false;
}
@@ -122,6 +126,8 @@ static bool add_message(enum message_type type, const char *message,
type, message, sqlite3_errstr(rc));
sqlite3_reset(stmt);
sqlite3_finalize(stmt);
if(opened_database)
dbclose();
return false;
}
@@ -130,26 +136,13 @@ static bool add_message(enum message_type type, const char *message,
{
logg("add_message(type=%u, message=%s) - SQL error step DELETE: %s",
type, message, sqlite3_errstr(rc));
if(opened_database)
dbclose();
return false;
}
if((rc = sqlite3_clear_bindings(stmt)) != SQLITE_OK)
{
logg("add_message(type=%u, message=%s) - SQL error clear DELETE: %s",
type, message, sqlite3_errstr(rc));
return false;
}
if((rc = sqlite3_reset(stmt)) != SQLITE_OK)
{
logg("add_message(type=%u, message=%s) - SQL error reset DELETE: %s",
type, message, sqlite3_errstr(rc));
return false;
}
if((rc = sqlite3_finalize(stmt)) != SQLITE_OK)
{
logg("add_message(type=%u, message=%s) - SQL error finalize DELETE: %s",
type, message, sqlite3_errstr(rc));
return false;
}
sqlite3_clear_bindings(stmt);
sqlite3_reset(stmt);
sqlite3_finalize(stmt);
}
// Prepare SQLite statement
@@ -157,9 +150,12 @@ static bool add_message(enum message_type type, const char *message,
const char *querystr = "INSERT INTO message (timestamp,type,message,blob1,blob2,blob3,blob4,blob5) "
"VALUES ((cast(strftime('%s', 'now') as int)),?,?,?,?,?,?,?);";
int rc = sqlite3_prepare_v2(FTL_db, querystr, -1, &stmt, NULL);
if( rc != SQLITE_OK ){
if( rc != SQLITE_OK )
{
logg("add_message(type=%u, message=%s) - SQL error prepare: %s",
type, message, sqlite3_errstr(rc));
if(opened_database)
dbclose();
return false;
}
@@ -170,6 +166,8 @@ static bool add_message(enum message_type type, const char *message,
type, message, sqlite3_errstr(rc));
sqlite3_reset(stmt);
sqlite3_finalize(stmt);
if(opened_database)
dbclose();
return false;
}
@@ -180,6 +178,8 @@ static bool add_message(enum message_type type, const char *message,
type, message, sqlite3_errstr(rc));
sqlite3_reset(stmt);
sqlite3_finalize(stmt);
if(opened_database)
dbclose();
return false;
}
@@ -211,6 +211,8 @@ static bool add_message(enum message_type type, const char *message,
type, message, 3 + j, datatype, sqlite3_errstr(rc));
sqlite3_reset(stmt);
sqlite3_finalize(stmt);
if(opened_database)
dbclose();
return false;
}
}