ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add current query to error log message

Browse Source
This commit is contained in:
Benau 2019-05-06 01:16:27 +08:00
parent 932b17a7e5
commit 9e06fe9b6f
1 changed files with 52 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/network/protocols/server_lobby.cpp
View File

@ -207,7 +207,8 @@ void ServerLobby::initDatabase()
ret = sqlite3_finalize(stmt); ret = sqlite3_finalize(stmt);
if (ret != SQLITE_OK) if (ret != SQLITE_OK)
{ {
Log::error("ServerLobby", "Error finalize database: %s", Log::error("ServerLobby",
"Error finalize database for query %s: %s", query.c_str(),
sqlite3_errmsg(m_db)); sqlite3_errmsg(m_db));
} }
} }
@ -239,8 +240,9 @@ void ServerLobby::initDatabase()
ret = sqlite3_finalize(stmt); ret = sqlite3_finalize(stmt);
if (ret != SQLITE_OK) if (ret != SQLITE_OK)
{ {
Log::error("ServerLobby", "Error finalize database: %s", Log::error("ServerLobby",
sqlite3_errmsg(m_db)); "Error finalize database for query %s: %s",
query.c_str(), sqlite3_errmsg(m_db));
} }
} }
if (!m_online_id_ban_table_exists) if (!m_online_id_ban_table_exists)
@ -286,14 +288,15 @@ void ServerLobby::initServerStatsTable()
m_server_stats_table = table_name; m_server_stats_table = table_name;
else else
{ {
Log::error("ServerLobby", "Error finalize database: %s", Log::error("ServerLobby",
sqlite3_errmsg(m_db)); "Error finalize database for query %s: %s",
query.c_str(), sqlite3_errmsg(m_db));
} }
} }
else else
{ {
Log::error("ServerLobby", "Error preparing database: %s", Log::error("ServerLobby", "Error preparing database for query %s: %s",
sqlite3_errmsg(m_db)); query.c_str(), sqlite3_errmsg(m_db));
} }
if (m_server_stats_table.empty()) if (m_server_stats_table.empty())
return; return;
@ -314,15 +317,16 @@ void ServerLobby::initServerStatsTable()
ret = sqlite3_finalize(stmt); ret = sqlite3_finalize(stmt);
if (ret != SQLITE_OK) if (ret != SQLITE_OK)
{ {
Log::error("ServerLobby", "Error finalize database: %s", Log::error("ServerLobby",
sqlite3_errmsg(m_db)); "Error finalize database for query %s: %s",
query.c_str(), sqlite3_errmsg(m_db));
m_server_stats_table = ""; m_server_stats_table = "";
} }
} }
else else
{ {
Log::error("ServerLobby", "Error preparing database: %s", Log::error("ServerLobby", "Error preparing database for query %s: %s",
sqlite3_errmsg(m_db)); query.c_str(), sqlite3_errmsg(m_db));
m_server_stats_table = ""; m_server_stats_table = "";
} }
STKHost::get()->setNextHostId(last_host_id); STKHost::get()->setNextHostId(last_host_id);
@ -339,14 +343,15 @@ void ServerLobby::initServerStatsTable()
ret = sqlite3_finalize(stmt); ret = sqlite3_finalize(stmt);
if (ret != SQLITE_OK) if (ret != SQLITE_OK)
{ {
Log::error("ServerLobby", "Error finalize database: %s", Log::error("ServerLobby",
sqlite3_errmsg(m_db)); "Error finalize database for query %s: %s",
query.c_str(), sqlite3_errmsg(m_db));
} }
} }
else else
{ {
Log::error("ServerLobby", "Error preparing database: %s", Log::error("ServerLobby", "Error preparing database for query %s: %s",
sqlite3_errmsg(m_db)); query.c_str(), sqlite3_errmsg(m_db));
} }
#endif #endif
} // initServerStatsTable } // initServerStatsTable
@ -382,14 +387,15 @@ void ServerLobby::writeDisconnectInfoTable(STKPeer* peer)
ret = sqlite3_finalize(stmt); ret = sqlite3_finalize(stmt);
if (ret != SQLITE_OK) if (ret != SQLITE_OK)
{ {
Log::error("ServerLobby", "Error finalize database: %s", Log::error("ServerLobby",
sqlite3_errmsg(m_db)); "Error finalize database for query %s: %s",
query.c_str(), sqlite3_errmsg(m_db));
} }
} }
else else
{ {
Log::error("ServerLobby", "Error preparing database: %s", Log::error("ServerLobby", "Error preparing database for query %s: %s",
sqlite3_errmsg(m_db)); query.c_str(), sqlite3_errmsg(m_db));
} }
#endif #endif
} // writeDisconnectInfoTable } // writeDisconnectInfoTable
@ -2341,14 +2347,15 @@ void ServerLobby::saveIPBanTable(const TransportAddress& addr)
ret = sqlite3_finalize(stmt); ret = sqlite3_finalize(stmt);
if (ret != SQLITE_OK) if (ret != SQLITE_OK)
{ {
Log::error("ServerLobby", "Error finalize database: %s", Log::error("ServerLobby",
sqlite3_errmsg(m_db)); "Error finalize database for query %s: %s",
query.c_str(), sqlite3_errmsg(m_db));
} }
} }
else else
{ {
Log::error("ServerLobby", "Error preparing database: %s", Log::error("ServerLobby", "Error preparing database for query %s: %s",
sqlite3_errmsg(m_db)); query.c_str(), sqlite3_errmsg(m_db));
} }
#endif #endif
} // saveIPBanTable } // saveIPBanTable
@ -2712,14 +2719,15 @@ void ServerLobby::handleUnencryptedConnection(std::shared_ptr<STKPeer> peer,
ret = sqlite3_finalize(stmt); ret = sqlite3_finalize(stmt);
if (ret != SQLITE_OK) if (ret != SQLITE_OK)
{ {
Log::error("ServerLobby", "Error finalize database: %s", Log::error("ServerLobby",
sqlite3_errmsg(m_db)); "Error finalize database for query %s: %s",
query.c_str(), sqlite3_errmsg(m_db));
} }
} }
else else
{ {
Log::error("ServerLobby", "Error preparing database: %s", Log::error("ServerLobby", "Error preparing database for query %s: %s",
sqlite3_errmsg(m_db)); query.c_str(), sqlite3_errmsg(m_db));
} }
#endif #endif
} // handleUnencryptedConnection } // handleUnencryptedConnection
@ -3522,14 +3530,15 @@ void ServerLobby::testBannedForIP(STKPeer* peer) const
ret = sqlite3_finalize(stmt); ret = sqlite3_finalize(stmt);
if (ret != SQLITE_OK) if (ret != SQLITE_OK)
{ {
Log::error("ServerLobby", "Error finalize database: %s", Log::error("ServerLobby",
sqlite3_errmsg(m_db)); "Error finalize database for query %s: %s",
query.c_str(), sqlite3_errmsg(m_db));
} }
} }
else else
{ {
Log::error("ServerLobby", "Error preparing database: %s", Log::error("ServerLobby", "Error preparing database for query %s: %s",
sqlite3_errmsg(m_db)); query.c_str(), sqlite3_errmsg(m_db));
return; return;
} }
if (row_id != -1) if (row_id != -1)
@ -3546,14 +3555,16 @@ void ServerLobby::testBannedForIP(STKPeer* peer) const
ret = sqlite3_finalize(stmt); ret = sqlite3_finalize(stmt);
if (ret != SQLITE_OK) if (ret != SQLITE_OK)
{ {
Log::error("ServerLobby", "Error finalize database: %s", Log::error("ServerLobby",
sqlite3_errmsg(m_db)); "Error finalize database for query %s: %s",
query.c_str(), sqlite3_errmsg(m_db));
} }
} }
else else
{ {
Log::error("ServerLobby", "Error preparing database: %s", Log::error("ServerLobby",
sqlite3_errmsg(m_db)); "Error preparing database for query %s: %s",
query.c_str(), sqlite3_errmsg(m_db));
} }
} }
#endif #endif
@ -3620,14 +3631,16 @@ void ServerLobby::testBannedForOnlineId(STKPeer* peer,
ret = sqlite3_finalize(stmt); ret = sqlite3_finalize(stmt);
if (ret != SQLITE_OK) if (ret != SQLITE_OK)
{ {
Log::error("ServerLobby", "Error finalize database: %s", Log::error("ServerLobby",
sqlite3_errmsg(m_db)); "Error finalize database for query %s: %s",
query.c_str(), sqlite3_errmsg(m_db));
} }
} }
else else
{ {
Log::error("ServerLobby", "Error preparing database: %s", Log::error("ServerLobby",
sqlite3_errmsg(m_db)); "Error preparing database for query %s: %s",
query.c_str(), sqlite3_errmsg(m_db));
} }
} }
#endif #endif