summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorpeavey <peavey@e03df62e-2008-0410-955e-edbf42e46eb7>2006-12-29 15:38:04 +0000
committerpeavey <peavey@e03df62e-2008-0410-955e-edbf42e46eb7>2006-12-29 15:38:04 +0000
commit117bfa37dee01e4df8820cbc21b1e40305df3ab3 (patch)
treedbf0ffa08355fcea51c63b94bb45aee58a298336 /src
parentba2d1219507a9e950777ff4c7bd099b09bdfdece (diff)
Fix for rehash/load/unload.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6158 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src')
-rw-r--r--src/modules/extra/m_pgsql.cpp34
1 files changed, 20 insertions, 14 deletions
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index eac70714d..7d669137f 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -537,7 +537,9 @@ public:
virtual ~ModulePgSQL()
{
DELETE(sqlsuccess);
+ ClearConnections();
ServerInstance->UnpublishInterface("SQL", this);
+ ServerInstance->UnpublishFeature("SQL");
ServerInstance->DoneWithInterface("SQLutils");
}
@@ -547,21 +549,24 @@ public:
List[I_OnUnloadModule] = List[I_OnRequest] = List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnUserDisconnect] = 1;
}
- virtual void OnRehash(const std::string &parameter)
+ void ClearConnections()
{
- ConfigReader conf(ServerInstance);
-
- /* 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++)
+ ConnMap::iterator iter;
+ while ((iter = connections.begin()) != connections.end())
{
+ connections.erase(iter);
DELETE(iter->second);
}
+ }
+
+ virtual void OnRehash(const std::string &parameter)
+ {
- /* Empty out our list of connections */
- connections.clear();
+ ServerInstance->Log(DEBUG, "<*********> OnRehash parameter: " + parameter);
+
+ ConfigReader conf(ServerInstance);
+
+ ClearConnections();
for(int i = 0; i < conf.Enumerate("database"); i++)
{
@@ -693,7 +698,6 @@ SQLConn::SQLConn(InspIRCd* SI, ModulePgSQL* self, const SQLhost& hi)
Instance->Log(DEBUG,"No need to resolve %s", this->host);
-
if(!this->DoConnect())
{
throw ModuleException("Connect failed");
@@ -764,6 +768,10 @@ void SQLConn::Close()
{
Instance->Log(DEBUG,"SQLConn::Close");
+ if (!this->Instance->SE->DelFd(this))
+ {
+ Instance->Log(DEBUG, "PQsocket cant be removed from the socket engine!");
+ }
this->fd = -1;
this->state = I_ERROR;
this->OnError(I_ERR_SOCKET);
@@ -774,8 +782,6 @@ void SQLConn::Close()
PQfinish(sql);
sql = NULL;
}
-
- return;
}
bool SQLConn::DoPoll()
@@ -1239,4 +1245,4 @@ class ModulePgSQLFactory : public ModuleFactory
extern "C" void * init_module( void )
{
return new ModulePgSQLFactory;
-}
+i}