@@ -855,7+858,7 @@ class ModulePgSQL : public Module
{
if (!HostInConf(iter->second->GetConfHost()))
{
{
if (!HostInConf(iter->second->GetConfHost()))
{
- DELETE(iter->second);
+ delete iter->second;
safei = iter;
--iter;
connections.erase(safei);
safei = iter;
--iter;
connections.erase(safei);
@@ -869,7+872,7 @@ class ModulePgSQL : public Module
while ((i = connections.begin()) != connections.end())
{
connections.erase(i);
while ((i = connections.begin()) != connections.end())
{
connections.erase(i);
- DELETE(i->second);
+ delete i->second;
}
}
}
}
@@ -877,7+880,7 @@ class ModulePgSQL : public Module
{
if (HasHost(hi))
{
{
if (HasHost(hi))
{
- ServerInstance->Log(DEFAULT, "WARNING: A pgsql connection with id: %s already exists, possibly due to DNS delay. Aborting connection attempt.", hi.id.c_str());
+ ServerInstance->Logs->Log("m_pgsql",DEFAULT, "WARNING: A pgsql connection with id: %s already exists, possibly due to DNS delay. Aborting connection attempt.", hi.id.c_str());
return;
}
return;
}
@@ -895,7+898,7 @@ class ModulePgSQL : public Module
{
if (conn == iter->second)
{
{
if (conn == iter->second)
{
- DELETE(iter->second);
+ delete iter->second;
connections.erase(iter);
break;
}
connections.erase(iter);
break;
}
@@ -904,7+907,7 @@ class ModulePgSQL : public Module