-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd is copyright (C) 2002-2004 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- * <omster@gmail.com>
- *
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2006-2007, 2009 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006-2007, 2009 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ * Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
*
- * ---------------------------------------------------
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <sstream>
-#include <string>
-#include <map>
-#include <libpq-fe.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
#include "inspircd.h"
-#include "configreader.h"
-
-#include "m_sqlv2.h"
+#include <cstdlib>
+#include <sstream>
+#include <libpq-fe.h>
+#include "sql.h"
/* $ModDesc: PostgreSQL Service Provider module for all other m_sql* modules, uses v2 of the SQL API */
-/* $CompileFlags: -I`pg_config --includedir` */
-/* $LinkerFlags: -L`pg_config --libdir` -lpq */
-
-/* UGH, UGH, UGH, UGH, UGH, UGH
- * I'm having trouble seeing how I
- * can avoid this. The core-defined
- * constructors for InspSocket just
- * aren't suitable...and if I'm
- * reimplementing them I need this so
- * I can access the socket engine :\
+/* $CompileFlags: -Iexec("pg_config --includedir") eval("my $s = `pg_config --version`;$s =~ /^.*?(\d+)\.(\d+)\.(\d+).*?$/;my $v = hex(sprintf("0x%02x%02x%02x", $1, $2, $3));print "-DPGSQL_HAS_ESCAPECONN" if(($v >= 0x080104) || ($v >= 0x07030F && $v < 0x070400) || ($v >= 0x07040D && $v < 0x080000) || ($v >= 0x080008 && $v < 0x080100));") */
+/* $LinkerFlags: -Lexec("pg_config --libdir") -lpq */
+
+/* SQLConn rewritten by peavey to
+ * use EventHandler instead of
+ * BufferedSocket. This is much neater
+ * and gives total control of destroy
+ * and delete of resources.
*/
-extern InspIRCd* ServerInstance;
-InspSocket* socket_ref[MAX_DESCRIPTORS];
/* Forward declare, so we can have the typedef neatly at the top */
class SQLConn;
+class ModulePgSQL;
typedef std::map<std::string, SQLConn*> ConnMap;
/* CREAD, Connecting and wants read event
* CWRITE, Connecting and wants write event
* WREAD, Connected/Working and wants read event
- * WWRITE, Connected/Working and wants write event
+ * WWRITE, Connected/Working and wants write event
+ * RREAD, Resetting and wants read event
+ * RWRITE, Resetting and wants write event
*/
-enum SQLstatus { CREAD, CWRITE, WREAD, WWRITE };
+enum SQLstatus { CREAD, CWRITE, WREAD, WWRITE, RREAD, RWRITE };
-class SQLerror
+class ReconnectTimer : public Timer
{
-public:
- std::string err;
-
- SQLerror(const std::string &s)
- : err(s)
+ private:
+ ModulePgSQL* mod;
+ public:
+ ReconnectTimer(ModulePgSQL* m) : Timer(5, ServerInstance->Time(), false), mod(m)
{
}
+ virtual void Tick(time_t TIME);
};
-/** SQLConn represents one SQL session.
- * Each session has its own persistent connection to the database.
- * This is a subclass of InspSocket so it can easily recieve read/write events from the core socket
- * engine, unlike the original MySQL module this module does not block. Ever. It gets a mild stabbing
- * if it dares to.
+struct QueueItem
+{
+ SQLQuery* c;
+ std::string q;
+ QueueItem(SQLQuery* C, const std::string& Q) : c(C), q(Q) {}
+};
+
+/** PgSQLresult is a subclass of the mostly-pure-virtual class SQLresult.
+ * All SQL providers must create their own subclass and define it's methods using that
+ * database library's data retriveal functions. The aim is to avoid a slow and inefficient process
+ * of converting all data to a common format before it reaches the result structure. This way
+ * data is passes to the module nearly as directly as if it was using the API directly itself.
*/
-class SQLConn : public InspSocket
+class PgSQLresult : public SQLResult
{
-private:
- Server* Srv; /* Server* for..uhm..something, maybe */
- std::string dbhost; /* Database server hostname */
- unsigned int dbport; /* Database server port */
- std::string dbname; /* Database name */
- std::string dbuser; /* Database username */
- std::string dbpass; /* Database password */
- bool ssl; /* If we should require SSL */
- PGconn* sql; /* PgSQL database connection handle */
- SQLstatus status; /* PgSQL database connection status */
-
-public:
-
- /* This class should only ever be created inside this module, using this constructor, so we don't have to worry about the default ones */
-
- SQLConn(Server* srv, const std::string &h, unsigned int p, const std::string &d, const std::string &u, const std::string &pwd, bool s)
- : InspSocket::InspSocket(), Srv(srv), dbhost(h), dbport(p), dbname(d), dbuser(u), dbpass(pwd), ssl(s), sql(NULL), status(CWRITE)
+ PGresult* res;
+ int currentrow;
+ int rows;
+ public:
+ PgSQLresult(PGresult* result) : res(result), currentrow(0)
{
- log(DEBUG, "Creating new PgSQL connection to database %s on %s:%u (%s/%s)", dbname.c_str(), dbhost.c_str(), dbport, dbuser.c_str(), dbpass.c_str());
-
- /* Some of this could be reviewed, unsure if I need to fill 'host' etc...
- * just copied this over from the InspSocket constructor.
- */
- strlcpy(this->host, dbhost.c_str(), MAXBUF);
- this->port = dbport;
-
- this->ClosePending = false;
-
- if(!inet_aton(this->host, &this->addy))
+ rows = PQntuples(res);
+ if (!rows)
+ rows = atoi(PQcmdTuples(res));
+ }
+
+ ~PgSQLresult()
+ {
+ PQclear(res);
+ }
+
+ virtual int Rows()
+ {
+ return rows;
+ }
+
+ virtual void GetCols(std::vector<std::string>& result)
+ {
+ result.resize(PQnfields(res));
+ for(unsigned int i=0; i < result.size(); i++)
{
- /* Its not an ip, spawn the resolver.
- * PgSQL doesn't do nonblocking DNS
- * lookups, so we do it for it.
- */
-
- log(DEBUG,"Attempting to resolve %s", this->host);
-
- this->dns.SetNS(Srv->GetConfig()->DNSServer);
- this->dns.ForwardLookupWithFD(this->host, fd);
-
- this->state = I_RESOLVING;
- socket_ref[this->fd] = this;
-
- return;
+ result[i] = PQfname(res, i);
}
- else
+ }
+
+ virtual SQLEntry GetValue(int row, int column)
+ {
+ char* v = PQgetvalue(res, row, column);
+ if (!v || PQgetisnull(res, row, column))
+ return SQLEntry();
+
+ return SQLEntry(std::string(v, PQgetlength(res, row, column)));
+ }
+
+ virtual bool GetRow(SQLEntries& result)
+ {
+ if (currentrow >= PQntuples(res))
+ return false;
+ int ncols = PQnfields(res);
+
+ for(int i = 0; i < ncols; i++)
{
- log(DEBUG,"No need to resolve %s", this->host);
- strlcpy(this->IP, this->host, MAXBUF);
-
- if(!this->DoConnect())
- {
- throw ModuleException("Connect failed");
- }
+ result.push_back(GetValue(currentrow, i));
}
-
- exit(-1);
+ currentrow++;
+
+ return true;
}
-
- ~SQLConn()
+};
+
+/** SQLConn represents one SQL session.
+ */
+class SQLConn : public SQLProvider, public EventHandler
+{
+ public:
+ reference<ConfigTag> conf; /* The <database> entry */
+ std::deque<QueueItem> queue;
+ PGconn* sql; /* PgSQL database connection handle */
+ SQLstatus status; /* PgSQL database connection status */
+ QueueItem qinprog; /* If there is currently a query in progress */
+
+ SQLConn(Module* Creator, ConfigTag* tag)
+ : SQLProvider(Creator, "SQL/" + tag->getString("id")), conf(tag), sql(NULL), status(CWRITE), qinprog(NULL, "")
+ {
+ if (!DoConnect())
+ {
+ ServerInstance->Logs->Log("m_pgsql",DEFAULT, "WARNING: Could not connect to database " + tag->getString("id"));
+ DelayReconnect();
+ }
+ }
+
+ CullResult cull()
{
-
+ this->SQLProvider::cull();
+ ServerInstance->Modules->DelService(*this);
+ return this->EventHandler::cull();
}
-
- bool DoResolve()
- {
- log(DEBUG, "Checking for DNS lookup result");
-
- if(this->dns.HasResult())
+
+ ~SQLConn()
+ {
+ SQLerror err(SQL_BAD_DBID);
+ if (qinprog.c)
{
- std::string res_ip = dns.GetResultIP();
-
- if(res_ip.length())
- {
- log(DEBUG, "Got result: %s", res_ip.c_str());
-
- strlcpy(this->IP, res_ip.c_str(), MAXBUF);
- dbhost = res_ip;
-
- socket_ref[this->fd] = NULL;
-
- return this->DoConnect();
- }
- else
- {
- log(DEBUG, "DNS lookup failed, dying horribly");
- Close();
- return false;
- }
+ qinprog.c->OnError(err);
+ delete qinprog.c;
}
- else
+ for(std::deque<QueueItem>::iterator i = queue.begin(); i != queue.end(); i++)
{
- log(DEBUG, "No result for lookup yet!");
- return true;
+ SQLQuery* q = i->c;
+ q->OnError(err);
+ delete q;
}
-
- exit(-1);
}
- bool DoConnect()
+ virtual void HandleEvent(EventType et, int errornum)
{
- log(DEBUG, "SQLConn::DoConnect()");
-
- if(!(sql = PQconnectStart(MkInfoStr().c_str())))
+ switch (et)
{
- log(DEBUG, "Couldn't allocate PGconn structure, aborting: %s", PQerrorMessage(sql));
- Close();
- return false;
+ case EVENT_READ:
+ case EVENT_WRITE:
+ DoEvent();
+ break;
+
+ case EVENT_ERROR:
+ DelayReconnect();
}
-
+ }
+
+ std::string GetDSN()
+ {
+ std::ostringstream conninfo("connect_timeout = '5'");
+ std::string item;
+
+ if (conf->readString("host", item))
+ conninfo << " host = '" << item << "'";
+
+ if (conf->readString("port", item))
+ conninfo << " port = '" << item << "'";
+
+ if (conf->readString("name", item))
+ conninfo << " dbname = '" << item << "'";
+
+ if (conf->readString("user", item))
+ conninfo << " user = '" << item << "'";
+
+ if (conf->readString("pass", item))
+ conninfo << " password = '" << item << "'";
+
+ if (conf->getBool("ssl"))
+ conninfo << " sslmode = 'require'";
+ else
+ conninfo << " sslmode = 'disable'";
+
+ return conninfo.str();
+ }
+
+ bool DoConnect()
+ {
+ sql = PQconnectStart(GetDSN().c_str());
+ if (!sql)
+ return false;
+
if(PQstatus(sql) == CONNECTION_BAD)
- {
- log(DEBUG, "PQconnectStart failed: %s", PQerrorMessage(sql));
- Close();
return false;
- }
-
- ShowStatus();
-
+
if(PQsetnonblocking(sql, 1) == -1)
- {
- log(DEBUG, "Couldn't set connection nonblocking: %s", PQerrorMessage(sql));
- Close();
return false;
- }
-
+
/* OK, we've initalised the connection, now to get it hooked into the socket engine
- * and then start polling it.
- */
-
- log(DEBUG, "Old DNS socket: %d", this->fd);
+ * and then start polling it.
+ */
this->fd = PQsocket(sql);
- log(DEBUG, "New SQL socket: %d", this->fd);
-
+
if(this->fd <= -1)
+ return false;
+
+ if (!ServerInstance->SE->AddFd(this, FD_WANT_NO_WRITE | FD_WANT_NO_READ))
{
- log(DEBUG, "PQsocket says we have an invalid FD: %d", this->fd);
- Close();
+ ServerInstance->Logs->Log("m_pgsql",DEBUG, "BUG: Couldn't add pgsql socket to socket engine");
return false;
}
-
- this->state = I_CONNECTING;
- ServerInstance->SE->AddFd(this->fd,false,X_ESTAB_MODULE);
- socket_ref[this->fd] = this;
-
+
/* Socket all hooked into the engine, now to tell PgSQL to start connecting */
-
return DoPoll();
}
-
- virtual void Close()
- {
- this->fd = -1;
- this->state = I_ERROR;
- this->OnError(I_ERR_SOCKET);
- this->ClosePending = true;
- log(DEBUG,"SQLConn::Close");
-
- if(sql)
- {
- PQfinish(sql);
- sql = NULL;
- }
-
- return;
- }
-
+
bool DoPoll()
{
switch(PQconnectPoll(sql))
{
case PGRES_POLLING_WRITING:
- log(DEBUG, "PGconnectPoll: PGRES_POLLING_WRITING");
+ ServerInstance->SE->ChangeEventMask(this, FD_WANT_POLL_WRITE | FD_WANT_NO_READ);
status = CWRITE;
- DoPoll();
- break;
+ return true;
case PGRES_POLLING_READING:
- log(DEBUG, "PGconnectPoll: PGRES_POLLING_READING");
+ ServerInstance->SE->ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
status = CREAD;
- break;
+ return true;
case PGRES_POLLING_FAILED:
- log(DEBUG, "PGconnectPoll: PGRES_POLLING_FAILED: %s", PQerrorMessage(sql));
- Close();
return false;
case PGRES_POLLING_OK:
- log(DEBUG, "PGconnectPoll: PGRES_POLLING_OK");
+ ServerInstance->SE->ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
status = WWRITE;
- Query("SELECT * FROM rawr");
- break;
- default:
- log(DEBUG, "PGconnectPoll: wtf?");
- break;
- }
-
- return true;
- }
-
- void ShowStatus()
- {
- switch(PQstatus(sql))
- {
- case CONNECTION_STARTED:
- log(DEBUG, "PQstatus: CONNECTION_STARTED: Waiting for connection to be made.");
- break;
-
- case CONNECTION_MADE:
- log(DEBUG, "PQstatus: CONNECTION_MADE: Connection OK; waiting to send.");
- break;
-
- case CONNECTION_AWAITING_RESPONSE:
- log(DEBUG, "PQstatus: CONNECTION_AWAITING_RESPONSE: Waiting for a response from the server.");
- break;
-
- case CONNECTION_AUTH_OK:
- log(DEBUG, "PQstatus: CONNECTION_AUTH_OK: Received authentication; waiting for backend start-up to finish.");
- break;
-
- case CONNECTION_SSL_STARTUP:
- log(DEBUG, "PQstatus: CONNECTION_SSL_STARTUP: Negotiating SSL encryption.");
- break;
-
- case CONNECTION_SETENV:
- log(DEBUG, "PQstatus: CONNECTION_SETENV: Negotiating environment-driven parameter settings.");
- break;
-
+ DoConnectedPoll();
default:
- log(DEBUG, "PQstatus: ???");
+ return true;
}
}
-
- virtual bool OnDataReady()
- {
- /* Always return true here, false would close the socket - we need to do that ourselves with the pgsql API */
- log(DEBUG, "OnDataReady(): status = %s", StatusStr());
-
- return DoEvent();
- }
-
- virtual bool OnConnected()
- {
- log(DEBUG, "OnConnected(): status = %s", StatusStr());
-
- return DoEvent();
- }
-
- bool DoEvent()
+
+ void DoConnectedPoll()
{
- if((status == CREAD) || (status == CWRITE))
+restart:
+ while (qinprog.q.empty() && !queue.empty())
{
- DoPoll();
+ /* There's no query currently in progress, and there's queries in the queue. */
+ DoQuery(queue.front());
+ queue.pop_front();
}
- else
+
+ if (PQconsumeInput(sql))
{
- if(PQconsumeInput(sql))
+ if (PQisBusy(sql))
{
- log(DEBUG, "PQconsumeInput succeeded");
-
- if(PQisBusy(sql))
+ /* Nothing happens here */
+ }
+ else if (qinprog.c)
+ {
+ /* Fetch the result.. */
+ PGresult* result = PQgetResult(sql);
+
+ /* PgSQL would allow a query string to be sent which has multiple
+ * queries in it, this isn't portable across database backends and
+ * we don't want modules doing it. But just in case we make sure we
+ * drain any results there are and just use the last one.
+ * If the module devs are behaving there will only be one result.
+ */
+ while (PGresult* temp = PQgetResult(sql))
{
- log(DEBUG, "Still busy processing command though");
+ PQclear(result);
+ result = temp;
}
- else
+
+ /* ..and the result */
+ PgSQLresult reply(result);
+ switch(PQresultStatus(result))
{
- log(DEBUG, "Looks like we have a result to process!");
-
- while(PGresult* result = PQgetResult(sql))
+ case PGRES_EMPTY_QUERY:
+ case PGRES_BAD_RESPONSE:
+ case PGRES_FATAL_ERROR:
{
- int cols = PQnfields(result);
-
- log(DEBUG, "Got result! :D");
- log(DEBUG, "%d rows, %d columns checking now what the column names are", PQntuples(result), cols);
-
- for(int i = 0; i < cols; i++)
- {
- log(DEBUG, "Column name: %s (%d)", PQfname(result, i));
- }
-
- PQclear(result);
+ SQLerror err(SQL_QREPLY_FAIL, PQresultErrorMessage(result));
+ qinprog.c->OnError(err);
+ break;
}
+ default:
+ /* Other values are not errors */
+ qinprog.c->OnResult(reply);
}
+
+ delete qinprog.c;
+ qinprog = QueueItem(NULL, "");
+ goto restart;
}
else
{
- log(DEBUG, "PQconsumeInput failed: %s", PQerrorMessage(sql));
+ qinprog.q.clear();
}
}
+ else
+ {
+ /* I think we'll assume this means the server died...it might not,
+ * but I think that any error serious enough we actually get here
+ * deserves to reconnect [/excuse]
+ * Returning true so the core doesn't try and close the connection.
+ */
+ DelayReconnect();
+ }
+ }
- return true;
+ bool DoResetPoll()
+ {
+ switch(PQresetPoll(sql))
+ {
+ case PGRES_POLLING_WRITING:
+ ServerInstance->SE->ChangeEventMask(this, FD_WANT_POLL_WRITE | FD_WANT_NO_READ);
+ status = CWRITE;
+ return DoPoll();
+ case PGRES_POLLING_READING:
+ ServerInstance->SE->ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
+ status = CREAD;
+ return true;
+ case PGRES_POLLING_FAILED:
+ return false;
+ case PGRES_POLLING_OK:
+ ServerInstance->SE->ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
+ status = WWRITE;
+ DoConnectedPoll();
+ default:
+ return true;
+ }
}
-
- std::string MkInfoStr()
- {
- /* XXX - This needs nonblocking DNS lookups */
-
- std::ostringstream conninfo("connect_timeout = '2'");
-
- if(dbhost.length())
- conninfo << " hostaddr = '" << dbhost << "'";
-
- if(dbport)
- conninfo << " port = '" << dbport << "'";
-
- if(dbname.length())
- conninfo << " dbname = '" << dbname << "'";
-
- if(dbuser.length())
- conninfo << " user = '" << dbuser << "'";
-
- if(dbpass.length())
- conninfo << " password = '" << dbpass << "'";
-
- if(ssl)
- conninfo << " sslmode = 'require'";
-
- return conninfo.str();
+
+ void DelayReconnect();
+
+ void DoEvent()
+ {
+ if((status == CREAD) || (status == CWRITE))
+ {
+ DoPoll();
+ }
+ else if((status == RREAD) || (status == RWRITE))
+ {
+ DoResetPoll();
+ }
+ else
+ {
+ DoConnectedPoll();
+ }
}
-
- const char* StatusStr()
+
+ void submit(SQLQuery *req, const std::string& q)
{
- if(status == CREAD) return "CREAD";
- if(status == CWRITE) return "CWRITE";
- if(status == WREAD) return "WREAD";
- if(status == WWRITE) return "WWRITE";
- return "Err...what, erm..BUG!";
+ if (qinprog.q.empty())
+ {
+ DoQuery(QueueItem(req,q));
+ }
+ else
+ {
+ // wait your turn.
+ queue.push_back(QueueItem(req,q));
+ }
}
-
- bool Query(const std::string &query)
+
+ void submit(SQLQuery *req, const std::string& q, const ParamL& p)
{
- if((status == WREAD) || (status == WWRITE))
+ std::string res;
+ unsigned int param = 0;
+ for(std::string::size_type i = 0; i < q.length(); i++)
{
- if(PQsendQuery(sql, query.c_str()))
- {
- log(DEBUG, "Dispatched query: %s", query.c_str());
- return true;
- }
+ if (q[i] != '?')
+ res.push_back(q[i]);
else
{
- log(DEBUG, "Failed to dispatch query: %s", PQerrorMessage(sql));
- return false;
+ if (param < p.size())
+ {
+ std::string parm = p[param++];
+ char buffer[MAXBUF];
+#ifdef PGSQL_HAS_ESCAPECONN
+ int error;
+ PQescapeStringConn(sql, buffer, parm.c_str(), parm.length(), &error);
+ if (error)
+ ServerInstance->Logs->Log("m_pgsql", DEBUG, "BUG: Apparently PQescapeStringConn() failed");
+#else
+ PQescapeString (buffer, parm.c_str(), parm.length());
+#endif
+ res.append(buffer);
+ }
}
}
-
- log(DEBUG, "Can't query until connection is complete");
- return false;
+ submit(req, res);
}
- virtual void OnClose()
+ void submit(SQLQuery *req, const std::string& q, const ParamM& p)
{
- /* Close PgSQL connection */
+ std::string res;
+ for(std::string::size_type i = 0; i < q.length(); i++)
+ {
+ if (q[i] != '$')
+ res.push_back(q[i]);
+ else
+ {
+ std::string field;
+ i++;
+ while (i < q.length() && isalnum(q[i]))
+ field.push_back(q[i++]);
+ i--;
+
+ ParamM::const_iterator it = p.find(field);
+ if (it != p.end())
+ {
+ std::string parm = it->second;
+ char buffer[MAXBUF];
+#ifdef PGSQL_HAS_ESCAPECONN
+ int error;
+ PQescapeStringConn(sql, buffer, parm.c_str(), parm.length(), &error);
+ if (error)
+ ServerInstance->Logs->Log("m_pgsql", DEBUG, "BUG: Apparently PQescapeStringConn() failed");
+#else
+ PQescapeString (buffer, parm.c_str(), parm.length());
+#endif
+ res.append(buffer);
+ }
+ }
+ }
+ submit(req, res);
}
- virtual void OnError(InspSocketError e)
+ void DoQuery(const QueueItem& req)
{
- /* Unsure if we need this, we should be reading/writing via the PgSQL API rather than the insp one... */
+ if (status != WREAD && status != WWRITE)
+ {
+ // whoops, not connected...
+ SQLerror err(SQL_BAD_CONN);
+ req.c->OnError(err);
+ delete req.c;
+ return;
+ }
+
+ if(PQsendQuery(sql, req.q.c_str()))
+ {
+ qinprog = req;
+ }
+ else
+ {
+ SQLerror err(SQL_QSEND_FAIL, PQerrorMessage(sql));
+ req.c->OnError(err);
+ delete req.c;
+ }
}
-
- virtual void OnTimeout()
+
+ void Close()
{
- /* Unused, I think */
+ ServerInstance->SE->DelFd(this);
+
+ if(sql)
+ {
+ PQfinish(sql);
+ sql = NULL;
+ }
}
-
};
class ModulePgSQL : public Module
{
-private:
- Server* Srv;
+ public:
ConnMap connections;
+ ReconnectTimer* retimer;
-public:
- ModulePgSQL(Server* Me)
- : Module::Module(Me), Srv(Me)
+ ModulePgSQL()
{
- log(DEBUG, "%s 'SQL' feature", Srv->PublishFeature("SQL", this) ? "Published" : "Couldn't publish");
- log(DEBUG, "%s 'PgSQL' feature", Srv->PublishFeature("PgSQL", this) ? "Published" : "Couldn't publish");
-
- OnRehash("");
}
- void Implements(char* List)
+ void init()
{
- List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnUserDisconnect] = 1;
+ ReadConf();
+
+ Implementation eventlist[] = { I_OnUnloadModule, I_OnRehash };
+ ServerInstance->Modules->Attach(eventlist, this, 2);
}
- virtual void OnRehash(const std::string ¶meter)
+ virtual ~ModulePgSQL()
{
- ConfigReader conf;
-
- /* Delete all the SQLConn objects in the connection lists,
- * this will call their destructors where they can handle
- * closing connections and such.
- */
- for(ConnMap::iterator iter = connections.begin(); iter != connections.end(); iter++)
- {
- DELETE(iter->second);
- }
-
- /* Empty out our list of connections */
- connections.clear();
-
- for(int i = 0; i < conf.Enumerate("database"); i++)
- {
- std::string id;
- SQLConn* newconn;
-
- id = conf.ReadValue("database", "id", i);
- newconn = new SQLConn(Srv, conf.ReadValue("database", "hostname", i),
- conf.ReadInteger("database", "port", i, true),
- conf.ReadValue("database", "name", i),
- conf.ReadValue("database", "username", i),
- conf.ReadValue("database", "password", i),
- conf.ReadFlag("database", "ssl", i));
-
- connections.insert(std::make_pair(id, newconn));
- }
+ if (retimer)
+ ServerInstance->Timers->DelTimer(retimer);
+ ClearAllConnections();
}
-
- virtual Version GetVersion()
+
+ virtual void OnRehash(User* user)
{
- return Version(1, 0, 0, 0, VF_VENDOR|VF_SERVICEPROVIDER);
+ ReadConf();
}
-
- virtual ~ModulePgSQL()
+
+ void ReadConf()
{
- }
-};
+ ConnMap conns;
+ ConfigTagList tags = ServerInstance->Config->ConfTags("database");
+ for(ConfigIter i = tags.first; i != tags.second; i++)
+ {
+ if (i->second->getString("module", "pgsql") != "pgsql")
+ continue;
+ std::string id = i->second->getString("id");
+ ConnMap::iterator curr = connections.find(id);
+ if (curr == connections.end())
+ {
+ SQLConn* conn = new SQLConn(this, i->second);
+ conns.insert(std::make_pair(id, conn));
+ ServerInstance->Modules->AddService(*conn);
+ }
+ else
+ {
+ conns.insert(*curr);
+ connections.erase(curr);
+ }
+ }
+ ClearAllConnections();
+ conns.swap(connections);
+ }
-class ModulePgSQLFactory : public ModuleFactory
-{
- public:
- ModulePgSQLFactory()
+ void ClearAllConnections()
{
+ for(ConnMap::iterator i = connections.begin(); i != connections.end(); i++)
+ {
+ i->second->cull();
+ delete i->second;
+ }
+ connections.clear();
}
-
- ~ModulePgSQLFactory()
+
+ void OnUnloadModule(Module* mod)
{
+ SQLerror err(SQL_BAD_DBID);
+ for(ConnMap::iterator i = connections.begin(); i != connections.end(); i++)
+ {
+ SQLConn* conn = i->second;
+ if (conn->qinprog.c && conn->qinprog.c->creator == mod)
+ {
+ conn->qinprog.c->OnError(err);
+ delete conn->qinprog.c;
+ conn->qinprog.c = NULL;
+ }
+ std::deque<QueueItem>::iterator j = conn->queue.begin();
+ while (j != conn->queue.end())
+ {
+ SQLQuery* q = j->c;
+ if (q->creator == mod)
+ {
+ q->OnError(err);
+ delete q;
+ j = conn->queue.erase(j);
+ }
+ else
+ j++;
+ }
+ }
}
-
- virtual Module * CreateModule(Server* Me)
+
+ Version GetVersion()
{
- return new ModulePgSQL(Me);
+ return Version("PostgreSQL Service Provider module for all other m_sql* modules, uses v2 of the SQL API", VF_VENDOR);
}
};
+void ReconnectTimer::Tick(time_t time)
+{
+ mod->retimer = NULL;
+ mod->ReadConf();
+}
-extern "C" void * init_module( void )
+void SQLConn::DelayReconnect()
{
- return new ModulePgSQLFactory;
+ 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);
+ }
+ }
}
+
+MODULE_INIT(ModulePgSQL)
projects / user / henk / code / inspircd.git / blobdiff