class SQLConnection;
class Notifier;
-extern InspIRCd* ServerInstance;
+
typedef std::map<std::string, SQLConnection*> ConnMap;
bool giveup = false;
static Module* SQLModule = NULL;
void push(const SQLrequest &q)
{
- log(DEBUG, "QueryQueue::push(): Adding %s query to queue: %s", ((q.pri) ? "priority" : "non-priority"), q.query.q.c_str());
-
if(q.pri)
priority.push_back(q);
else
{
/* A number of affected rows from from mysql_affected_rows.
*/
- log(DEBUG,"Created new MySQLresult of non-error type");
fieldlists.clear();
rows = 0;
if (affected_rows >= 1)
SQLfield sqlf(b, !row[field_count]);
colnames.push_back(a);
fieldlists[n].push_back(sqlf);
- log(DEBUG,"Inc field count to %d",field_count+1);
field_count++;
}
n++;
}
mysql_free_result(res);
}
- log(DEBUG, "Created new MySQL result; %d rows, %d columns", rows, colnames.size());
}
MySQLresult(Module* self, Module* to, SQLerror e, unsigned int id) : SQLresult(self, to, id), currentrow(0)
{
rows = 0;
error = e;
- log(DEBUG,"Created new MySQLresult of error type");
}
~MySQLresult()
return fieldlists[row][column];
}
- log(DEBUG,"Danger will robinson, we don't have row %d, column %d!", row, column);
throw SQLbadColName();
/* XXX: We never actually get here because of the throw */
/* Parse the command string and dispatch it to mysql */
SQLrequest& req = queue.front();
- log(DEBUG,"DO QUERY: %s",req.query.q.c_str());
/* Pointer to the buffer we screw around with substitution in */
char* query;
req.query.p.pop_front();
}
else
- {
- log(DEBUG, "Found a substitution location but no parameter to substitute :|");
break;
- }
}
else
{
*queryend = 0;
- log(DEBUG, "Attempting to dispatch query: %s", query);
-
pthread_mutex_lock(&queue_mutex);
req.query.q = query;
pthread_mutex_unlock(&queue_mutex);
- log(DEBUG,"REQUEST ID: %d",req.id);
-
if (!mysql_real_query(&connection, req.query.q.data(), req.query.q.length()))
{
/* Successfull query */
{
/* XXX: See /usr/include/mysql/mysqld_error.h for a list of
* possible error numbers and error messages */
- log(DEBUG,"SQL ERROR: %s",mysql_error(&connection));
SQLerror e(QREPLY_FAIL, ConvToStr(mysql_errno(&connection)) + std::string(": ") + mysql_error(&connection));
MySQLresult* r = new MySQLresult(SQLModule, req.GetSource(), e, req.id);
r->dbid = this->GetID();
ConnMap Connections;
-void ConnectDatabases(Server* Srv)
+void ConnectDatabases(InspIRCd* ServerInstance)
{
for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++)
{
i->second->SetEnable(true);
if (i->second->Connect())
{
- Srv->Log(DEFAULT,"SQL: Successfully connected database "+i->second->GetHost());
+ log(DEFAULT,"SQL: Successfully connected database "+i->second->GetHost());
}
else
{
- Srv->Log(DEFAULT,"SQL: Failed to connect database "+i->second->GetHost()+": Error: "+i->second->GetError());
+ log(DEFAULT,"SQL: Failed to connect database "+i->second->GetHost()+": Error: "+i->second->GetError());
i->second->SetEnable(false);
}
}
}
-void LoadDatabases(ConfigReader* ThisConf, Server* Srv)
+void LoadDatabases(ConfigReader* ThisConf, InspIRCd* ServerInstance)
{
- Srv->Log(DEFAULT,"SQL: Loading database settings");
+ log(DEFAULT,"SQL: Loading database settings");
Connections.clear();
- Srv->Log(DEBUG,"Cleared connections");
+ log(DEBUG,"Cleared connections");
for (int j =0; j < ThisConf->Enumerate("database"); j++)
{
std::string db = ThisConf->ReadValue("database","name",j);
std::string pass = ThisConf->ReadValue("database","password",j);
std::string host = ThisConf->ReadValue("database","hostname",j);
std::string id = ThisConf->ReadValue("database","id",j);
- Srv->Log(DEBUG,"Read database settings");
+ log(DEBUG,"Read database settings");
if ((db != "") && (host != "") && (user != "") && (id != "") && (pass != ""))
{
SQLConnection* ThisSQL = new SQLConnection(host,user,pass,db,id);
- Srv->Log(DEFAULT,"Loaded database: "+ThisSQL->GetHost());
+ log(DEFAULT,"Loaded database: "+ThisSQL->GetHost());
Connections[id] = ThisSQL;
- Srv->Log(DEBUG,"Pushed back connection");
+ log(DEBUG,"Pushed back connection");
}
}
- ConnectDatabases(Srv);
+ ConnectDatabases(ServerInstance);
}
void NotifyMainThread(SQLConnection* connection_with_new_result)
* block if we like. We just send the connection id of the
* connection back.
*/
- log(DEBUG,"Notify of result on connection: %s",connection_with_new_result->GetID().c_str());
- if (send(QueueFD, connection_with_new_result->GetID().c_str(), connection_with_new_result->GetID().length()+1, 0) < 1) // add one for null terminator
- {
- log(DEBUG,"Error writing to QueueFD: %s",strerror(errno));
- }
- log(DEBUG,"Sent it on its way via fd=%d",QueueFD);
+ send(QueueFD, connection_with_new_result->GetID().c_str(), connection_with_new_result->GetID().length()+1, 0);
}
void* DispatcherThread(void* arg);
{
insp_sockaddr sock_us;
socklen_t uslen;
- Server* Srv;
+
public:
/* Create a socket on a random port. Let the tcp stack allocate us an available port */
#ifdef IPV6
- Notifier(InspIRCd* SI, Server* S) : InspSocket(SI, "::1", 0, true, 3000), Srv(S)
+ Notifier(InspIRCd* SI) : InspSocket(SI, "::1", 0, true, 3000)
#else
- Notifier(InspIRCd* SI, Server* S) : InspSocket(SI, "127.0.0.1", 0, true, 3000), Srv(S)
+ Notifier(InspIRCd* SI) : InspSocket(SI, "127.0.0.1", 0, true, 3000)
#endif
{
uslen = sizeof(sock_us);
}
}
- Notifier(InspIRCd* SI, int newfd, char* ip, Server* S) : InspSocket(SI, newfd, ip), Srv(S)
+ Notifier(InspIRCd* SI, int newfd, char* ip) : InspSocket(SI, newfd, ip)
{
- log(DEBUG,"Constructor of new socket");
+ ilog(Instance,DEBUG,"Constructor of new socket");
}
/* Using getsockname and ntohs, we can determine which port number we were allocated */
virtual int OnIncomingConnection(int newsock, char* ip)
{
- log(DEBUG,"Inbound connection on fd %d!",newsock);
- Notifier* n = new Notifier(this->Instance, newsock, ip, Srv);
- Srv->AddSocket(n);
+ ilog(Instance,DEBUG,"Inbound connection on fd %d!",newsock);
+ Notifier* n = new Notifier(this->Instance, newsock, ip);
+ this->Instance->AddSocket(n);
return true;
}
virtual bool OnDataReady()
{
- log(DEBUG,"Inbound data!");
+ ilog(Instance,DEBUG,"Inbound data!");
char* data = this->Read();
ConnMap::iterator iter;
if (data && *data)
{
- log(DEBUG,"Looking for connection %s",data);
+ ilog(Instance,DEBUG,"Looking for connection %s",data);
/* We expect to be sent a null terminated string */
if((iter = Connections.find(data)) != Connections.end())
{
- log(DEBUG,"Found it!");
+ ilog(Instance,DEBUG,"Found it!");
/* Lock the mutex, send back the data */
pthread_mutex_lock(&results_mutex);
class ModuleSQL : public Module
{
public:
- Server *Srv;
+
ConfigReader *Conf;
+ InspIRCd* PublicServerInstance;
pthread_t Dispatcher;
int currid;
return NULL;
}
- ModuleSQL(Server* Me)
+ ModuleSQL(InspIRCd* Me)
: Module::Module(Me)
{
- Srv = Me;
- Conf = new ConfigReader();
+
+ Conf = new ConfigReader(ServerInstance);
+ PublicServerInstance = ServerInstance;
currid = 0;
SQLModule = this;
- MessagePipe = new Notifier(ServerInstance, Srv);
- Srv->AddSocket(MessagePipe);
+ MessagePipe = new Notifier(ServerInstance);
+ ServerInstance->AddSocket(MessagePipe);
log(DEBUG,"Bound notifier to 127.0.0.1:%d",MessagePipe->GetPort());
pthread_attr_t attribs;
{
throw ModuleException("m_mysql: Failed to create dispatcher thread: " + std::string(strerror(errno)));
}
- if (!Srv->PublishFeature("SQL", this))
+ if (!ServerInstance->PublishFeature("SQL", this))
{
/* Tell worker thread to exit NOW */
giveup = true;
void* DispatcherThread(void* arg)
{
- log(DEBUG,"Starting Dispatcher thread, mysql version %d",mysql_get_client_version());
ModuleSQL* thismodule = (ModuleSQL*)arg;
- LoadDatabases(thismodule->Conf, thismodule->Srv);
+ LoadDatabases(thismodule->Conf, thismodule->PublicServerInstance);
/* Connect back to the Notifier */
if ((QueueFD = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1)
{
/* crap, we're out of sockets... */
- log(DEBUG,"QueueFD cant be created");
return NULL;
}
- log(DEBUG,"Initialize QueueFD to %d",QueueFD);
-
insp_sockaddr addr;
#ifdef IPV6
if (connect(QueueFD, (sockaddr*)&addr,sizeof(addr)) == -1)
{
/* wtf, we cant connect to it, but we just created it! */
- log(DEBUG,"QueueFD cant connect!");
return NULL;
}
- log(DEBUG,"Connect QUEUE FD");
-
while (!giveup)
{
SQLConnection* conn = NULL;
/* Theres an item! */
if (conn)
{
- log(DEBUG,"Process Leading query");
conn->DoLeadingQuery();
/* XXX: Lock */
{
}
- virtual Module * CreateModule(Server* Me)
+ virtual Module * CreateModule(InspIRCd* Me)
{
return new ModuleSQL(Me);
}
projects / user / henk / code / inspircd.git / blobdiff