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

Patch for v2.0.27 #67

Open
wants to merge 4 commits into
base: origin-v2.0.27-1733722261
Choose a base branch
from
Open

Patch for v2.0.27 #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ad5e61
commit patch 20333034
Dec 9, 2024
e93cd05
commit patch 17841425
Dec 9, 2024
7a0fe37
commit patch 17841424
Dec 9, 2024
736f8c4
commit patch 25044894
Dec 9, 2024
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
6 changes: 6 additions & 0 deletions src/modules/extra/m_mysql.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,9 @@ ModuleSQL::ModuleSQL()

void ModuleSQL::init()
{
if (mysql_library_init(0, NULL, NULL))
throw ModuleException("Unable to initialise the MySQL library!");

Dispatcher = new DispatcherThread(this);
ServerInstance->Threads->Start(Dispatcher);

Expand All @@ -397,10 +400,13 @@ ModuleSQL::~ModuleSQL()
Dispatcher->OnNotify();
delete Dispatcher;
}

for(ConnMap::iterator i = connections.begin(); i != connections.end(); i++)
{
delete i->second;
}

mysql_library_end();
}

void ModuleSQL::OnRehash(User* user)
Expand Down
36 changes: 25 additions & 11 deletions src/modules/extra/m_pgsql.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ typedef std::map<std::string, SQLConn*> ConnMap;
* WWRITE, Connected/Working and wants write event
* RREAD, Resetting and wants read event
* RWRITE, Resetting and wants write event
* DEAD, The connection has died
*/
enum SQLstatus { CREAD, CWRITE, WREAD, WWRITE, RREAD, RWRITE };
enum SQLstatus { CREAD, CWRITE, WREAD, WWRITE, RREAD, RWRITE, DEAD };

class ReconnectTimer : public Timer
{
Expand Down Expand Up @@ -178,6 +179,7 @@ class SQLConn : public SQLProvider, public EventHandler
q->OnError(err);
delete q;
}
Close();
}

virtual void HandleEvent(EventType et, int errornum)
Expand Down Expand Up @@ -265,6 +267,8 @@ class SQLConn : public SQLProvider, public EventHandler
status = CREAD;
return true;
case PGRES_POLLING_FAILED:
ServerInstance->SE->ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
status = DEAD;
return false;
case PGRES_POLLING_OK:
ServerInstance->SE->ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
Expand Down Expand Up @@ -380,7 +384,7 @@ class SQLConn : public SQLProvider, public EventHandler
{
DoResetPoll();
}
else
else if (status == WREAD || status == WWRITE)
{
DoConnectedPoll();
}
Expand Down Expand Up @@ -488,8 +492,12 @@ class SQLConn : public SQLProvider, public EventHandler

void Close()
{
status = DEAD;
ServerInstance->SE->DelFd(this);

if (GetFd() != -1 && ServerInstance->SE->HasFd(GetFd()))
ServerInstance->SE->DelFd(this);

if(sql)
{
PQfinish(sql);
Expand Down Expand Up @@ -541,8 +549,13 @@ class ModulePgSQL : public Module
if (curr == connections.end())
{
SQLConn* conn = new SQLConn(this, i->second);
conns.insert(std::make_pair(id, conn));
ServerInstance->Modules->AddService(*conn);
if (conn->status != DEAD)
{
conns.insert(std::make_pair(id, conn));
ServerInstance->Modules->AddService(*conn);
}
// If the connection is dead it has already been queued for culling
// at the end of the main loop so we don't need to delete it here.
}
else
{
Expand Down Expand Up @@ -606,17 +619,18 @@ void ReconnectTimer::Tick(time_t time)

void SQLConn::DelayReconnect()
{
status = DEAD;
ModulePgSQL* mod = (ModulePgSQL*)(Module*)creator;

ConnMap::iterator it = mod->connections.find(conf->getString("id"));
if (it != mod->connections.end())
{
mod->connections.erase(it);
ServerInstance->GlobalCulls.AddItem((EventHandler*)this);
if (!mod->retimer)
{
mod->retimer = new ReconnectTimer(mod);
ServerInstance->Timers->AddTimer(mod->retimer);
}

ServerInstance->GlobalCulls.AddItem((EventHandler*)this);
if (!mod->retimer)
{
mod->retimer = new ReconnectTimer(mod);
ServerInstance->Timers->AddTimer(mod->retimer);
}
}

Expand Down