edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enhance SQL error reporting

Browse source
This commit is contained in:
Zwelf 2020-08-21 10:37:52 +02:00
parent 579b763575
commit a808ad5463
1 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/engine/server/databases/connection_pool.cpp
View file

@ -153,6 +153,7 @@ void CDbConnectionPool::Worker()
{
if(ExecSqlFunc(m_aapDbConnections[Mode::READ][i].get(), pThreadData.get(), false))
{
dbg_msg("sql", "%s done on read database %d", pThreadData->m_pName, i);
Success = true;
break;
}
@ -164,6 +165,7 @@ void CDbConnectionPool::Worker()
{
if(ExecSqlFunc(m_aapDbConnections[Mode::WRITE][i].get(), pThreadData.get(), false))
{
dbg_msg("sql", "%s done on write database %d", pThreadData->m_pName, i);
Success = true;
break;
}
@ -174,6 +176,7 @@ void CDbConnectionPool::Worker()
{
if(ExecSqlFunc(m_aapDbConnections[Mode::WRITE_BACKUP][i].get(), pThreadData.get(), true))
{
dbg_msg("sql", "%s done on write backup database %d", pThreadData->m_pName, i);
Success = true;
break;
}
@ -181,8 +184,8 @@ void CDbConnectionPool::Worker()
}
} break;
}
if(Success)
dbg_msg("sql", "%s done", pThreadData->m_pName);
if(!Success)
dbg_msg("sql", "%s failed on all databases", pThreadData->m_pName);
}
}
@ -208,18 +211,35 @@ bool CDbConnectionPool::ExecSqlFunc(IDbConnection *pConnection, CSqlExecData *pD
#if defined(CONF_SQL)
catch (sql::SQLException &e)
{
dbg_msg("sql", "MySQL Error: %s", e.what());
dbg_msg("sql", "%s MySQL Error: %s", pData->m_pName, e.what());
}
#endif
catch (std::runtime_error &e)
{
dbg_msg("sql", "SQLite Error: %s", e.what());
dbg_msg("sql", "%s SQLite Error: %s", pData->m_pName, e.what());
}
catch (...)
{
dbg_msg("sql", "Unexpected exception caught");
dbg_msg("sql", "%s Unexpected exception caught", pData->m_pName);
}
try
{
pConnection->Unlock();
}
#if defined(CONF_SQL)
catch (sql::SQLException &e)
{
dbg_msg("sql", "%s MySQL Error during unlock: %s", pData->m_pName, e.what());
}
#endif
catch (std::runtime_error &e)
{
dbg_msg("sql", "%s SQLite Error during unlock: %s", pData->m_pName, e.what());
}
catch (...)
{
dbg_msg("sql", "%s Unexpected exception caught during unlock", pData->m_pName);
}
pConnection->Disconnect();
if(!Success)
dbg_msg("sql", "%s failed", pData->m_pName);