class ReconnectTimer : public Timer
{
- private:
+ private:
Module* mod;
- public:
+ public:
ReconnectTimer(InspIRCd* SI, Module* m)
: Timer(5, SI->Time(), false), mod(m)
{
virtual void OnError(ResolverError e, const std::string &errormessage)
{
- ServerInstance->Log(DEBUG, "PgSQL: DNS lookup failed (%s), dying horribly", errormessage.c_str());
+ ServerInstance->Logs->Log("m_pgsql",DEBUG, "PgSQL: DNS lookup failed (%s), dying horribly", errormessage.c_str());
}
};
*/
class SQLConn : public EventHandler
{
- private:
- InspIRCd* Instance;
+ private:
+ InspIRCd* Instance;
SQLhost confhost; /* The <database> entry */
Module* us; /* Pointer to the SQL provider itself */
PGconn* sql; /* PgSQL database connection handle */
QueryQueue queue; /* Queue of queries waiting to be executed on this connection */
time_t idle; /* Time we last heard from the database */
- public:
+ public:
SQLConn(InspIRCd* SI, Module* self, const SQLhost& hi)
: EventHandler(), Instance(SI), confhost(hi), us(self), sql(NULL), status(CWRITE), qinprog(false)
{
idle = this->Instance->Time();
if(!DoConnect())
{
- Instance->Log(DEFAULT, "WARNING: Could not connect to database with id: " + ConvToStr(hi.id));
+ Instance->Logs->Log("m_pgsql",DEFAULT, "WARNING: Could not connect to database with id: " + ConvToStr(hi.id));
DelayReconnect();
}
}
if (!this->Instance->SE->AddFd(this))
{
- Instance->Log(DEBUG, "BUG: Couldn't add pgsql socket to socket engine");
+ Instance->Logs->Log("m_pgsql",DEBUG, "BUG: Couldn't add pgsql socket to socket engine");
return false;
}
case PGRES_EMPTY_QUERY:
case PGRES_BAD_RESPONSE:
case PGRES_FATAL_ERROR:
- reply.error.Id(QREPLY_FAIL);
+ reply.error.Id(SQL_QREPLY_FAIL);
reply.error.Str(PQresultErrorMessage(result));
default:;
/* No action, other values are not errors */
#endif
if(error)
{
- Instance->Log(DEBUG, "BUG: Apparently PQescapeStringConn() failed somehow...don't know how or what to do...");
+ Instance->Logs->Log("m_pgsql",DEBUG, "BUG: Apparently PQescapeStringConn() failed somehow...don't know how or what to do...");
}
/* Incremenet queryend to the end of the newly escaped parameter */
}
else
{
- Instance->Log(DEBUG, "BUG: Found a substitution location but no parameter to substitute :|");
+ Instance->Logs->Log("m_pgsql",DEBUG, "BUG: Found a substitution location but no parameter to substitute :|");
break;
}
}
else
{
delete[] query;
- return SQLerror(QSEND_FAIL, PQerrorMessage(sql));
+ return SQLerror(SQL_QSEND_FAIL, PQerrorMessage(sql));
}
}
}
- return SQLerror(BAD_CONN, "Can't query until connection is complete");
+ return SQLerror(SQL_BAD_CONN, "Can't query until connection is complete");
}
SQLerror Query(const SQLrequest &req)
}
else
{
- Instance->Log(DEBUG, "BUG: PQsocket cant be removed from socket engine!");
+ Instance->Logs->Log("m_pgsql",DEBUG, "BUG: PQsocket cant be removed from socket engine!");
}
}
class ModulePgSQL : public Module
{
- private:
+ private:
ConnMap connections;
unsigned long currid;
char* sqlsuccess;
ReconnectTimer* retimer;
- public:
+ public:
ModulePgSQL(InspIRCd* Me)
- : Module::Module(Me), currid(0)
+ : Module(Me), currid(0)
{
ServerInstance->Modules->UseInterface("SQLutils");
else
{
/* Invalid address family, die horribly. */
- ServerInstance->Log(DEBUG, "BUG: insp_aton failed returning -1, oh noes.");
+ ServerInstance->Logs->Log("m_pgsql",DEBUG, "BUG: insp_aton failed returning -1, oh noes.");
}
}
}
{
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;
}
req->id = NewID();
req->error = iter->second->Query(*req);
- return (req->error.Id() == NO_ERROR) ? sqlsuccess : NULL;
+ return (req->error.Id() == SQL_NO_ERROR) ? sqlsuccess : NULL;
}
else
{
- req->error.Id(BAD_DBID);
+ req->error.Id(SQL_BAD_DBID);
return NULL;
}
}
virtual Version GetVersion()
{
- return Version(1, 1, 0, 0, VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
+ return Version("$Id$", VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
}
};