Skip to content
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

Jump to bottom

Connection checking for correctly work SB_Connect native #30

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Connection checking for correctly work SB_Connect native #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file modified game/addons/sourcemod/plugins/sourcebans.smx
View file
Open in desktop
Binary file not shown.
34 changes: 34 additions & 0 deletions game/addons/sourcemod/scripting/sourcebans.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,16 @@ enum DatabaseState
DatabaseState_Connecting,
DatabaseState_Connected
}
enum CheckingState
{
CheckingState_None = 0,
CheckingState_Active
}

new ConfigState:g_iConfigState;
new g_iConnectLock = 0;
new DatabaseState:g_iDatabaseState;
new CheckingState:g_iCheckingState;
new g_iSequence = 0;
new g_iServerPort;
new Handle:g_hConfig;
Expand Down Expand Up @@ -267,6 +273,8 @@ public Query_ServerInsert(Handle:owner, Handle:hndl, const String:error[], any:d

public Query_ExecuteCallback(Handle:owner, Handle:hndl, const String:error[], any:pack)
{
CheckConnection(hndl);

ResetPack(pack);
new Handle:plugin = Handle:ReadPackCell(pack);
new SQLTCallback:callback = SQLTCallback:ReadPackCell(pack);
Expand All @@ -283,10 +291,23 @@ public Query_ExecuteCallback(Handle:owner, Handle:hndl, const String:error[], an

public Query_ErrorCheck(Handle:owner, Handle:hndl, const String:error[], any:data)
{
CheckConnection(hndl);

if(error[0])
LogError("%T (%s)", "Failed to query database", LANG_SERVER, error);
}

public Query_PingDBCallback(Handle:owner, Handle:hndl, const String:error[], any:data)
{
if(!hndl || error[0])
{
LogError("Lost connection to database");
CloseHandle(g_hDatabase);
g_hDatabase = INVALID_HANDLE;
g_iDatabaseState = DatabaseState_None;
}
g_iCheckingState = CheckingState_None;
}

/**
* Connect Callback
Expand Down Expand Up @@ -515,3 +536,16 @@ ExecuteQuery(SQLTCallback:callback, String:sQuery[4096], any:data = 0, DBPriorit

SQL_TQuery(g_hDatabase, callback, sQuery, data, prio);
}

CheckConnection(Handle:hndl)
{
if(hndl == INVALID_HANDLE && g_iDatabaseState == DatabaseState_Connected)
{
// Possible we lost connection to db. Also it could be an SQL-error.
if(g_iCheckingState == CheckingState_None)
{
g_iCheckingState = CheckingState_Active;
SQL_TQuery(g_hDatabase, Query_PingDBCallback, "SELECT 1", _, DBPrio_High);
}
}
}