Skip to content

extend the Error Handling's logics #1105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+57 −5
Open

extend the Error Handling's logics #1105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f9babc2
Update database_connection.cpp
Zorono Jul 17, 2025
02988dc
Update databases_component.cpp
Zorono Jul 17, 2025
b8f5fc1
Update databases_component.cpp
Zorono Jul 17, 2025
1fa17d6
Update databases_component.hpp
Zorono Jul 17, 2025
f2de375
just a beginner try to fix error with GCC
Zorono Jul 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 46 additions & 5 deletions Server/Components/Databases/database_connection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,55 @@ IDatabaseResultSet* DatabaseConnection::executeQuery(StringView query)
IDatabaseResultSet* ret(parentDatabasesComponent->createResultSet());
if (ret)
{
// TODO: Properly handle errors
parentDatabasesComponent->logQuery("[log_sqlite_queries]: %.*s", PRINT_VIEW(query));
if (sqlite3_exec(databaseConnectionHandle, query.data(), queryStepExecuted, ret, nullptr) != SQLITE_OK)
char *sqlError = nullptr;
int sqlRet = 999;
sqlRet = sqlite3_exec(databaseConnectionHandle, query.data(), queryStepExecuted, ret, &sqlError);
if(sqlRet == SQLITE_BUSY)
{
parentDatabasesComponent->log(LogLevel::Error, "[log_sqlite]: Error executing query.");
parentDatabasesComponent->freeResultSet(*ret);
ret = nullptr;
int sqlRetries = 5;
while (sqlRetries-- > 0) {
parentDatabasesComponent->log(LogLevel::Error, "[log_sqlite]: Error executing query. Database is busy, retrying...");
sqlite3_sleep(100);
sqlRet = sqlite3_exec(databaseConnectionHandle, query.data(), queryStepExecuted, ret, &sqlError);
if (sqlRet != SQLITE_OK)
{
if(sqlRet != SQLITE_BUSY)
{
if(sqlError)
{
parentDatabasesComponent->log(LogLevel::Error, "[log_sqlite]: Error executing query. %s", sqlError);
}
else
{
parentDatabasesComponent->log(LogLevel::Error, "[log_sqlite]: Error executing query.");
}
break;
}
}
else
{
break;
}
}
}
else
{
if(sqlRet != SQLITE_OK)
{
if(sqlError)
{
parentDatabasesComponent->log(LogLevel::Error, "[log_sqlite]: Error executing query. %s", sqlError);
}
else
{
parentDatabasesComponent->log(LogLevel::Error, "[log_sqlite]: Error executing query.");
}
parentDatabasesComponent->freeResultSet(*ret);
ret = nullptr;
}
}
sqlite3_free(sqlError);
}
else
{
Expand Down
10 changes: 10 additions & 0 deletions Server/Components/Databases/databases_component.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ void DatabasesComponent::onLoad(ICore* c)
core_ = c;
logSQLite_ = core_->getConfig().getBool("logging.log_sqlite");
logSQLiteQueries_ = core_->getConfig().getBool("logging.log_sqlite_queries");
SQLiteTimeout_ = core_->getConfig().getInt("sqlite_timeout");
}

/// To optionally log things from connections.
Expand Down Expand Up @@ -68,12 +69,21 @@ IDatabaseConnection* DatabasesComponent::open(StringView path, int flags)
sqlite3* database_connection_handle(nullptr);
if (sqlite3_open_v2(path.data(), &database_connection_handle, flags, nullptr) == SQLITE_OK)
{
if(SQLiteTimeout_ && *SQLiteTimeout_)
{
sqlite3_busy_timeout(database_connection_handle, *SQLiteTimeout_);
}
ret = databaseConnections.emplace(this, database_connection_handle);
if (!ret)
{
sqlite3_close_v2(database_connection_handle);
}
}
else
{
this->log(LogLevel::Error, "[log_sqlite]: Cannot open database '%s'. %s", path.data(), sqlite3_errmsg(database_connection_handle));
sqlite3_close_v2(database_connection_handle);
}
return ret;
}

Expand Down
1 change: 1 addition & 0 deletions Server/Components/Databases/databases_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class DatabasesComponent final : public IDatabasesComponent, public NoCopy

bool* logSQLite_;
bool* logSQLiteQueries_;
int* SQLiteTimeout_;

ICore* core_;

Expand Down
Loading