Fix a bunch of weird indentation and spacing issues.

[user/henk/code/inspircd.git] / src / modules / extra / m_pgsql.cpp

diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 916f164d189142f513cbb60c202f71ab2f790f75..e1db996c896d918867bd8677b6190a174df03daa 100644 (file)
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -3,15 +3,15 @@
  *
  *   Copyright (C) 2016 Adam <Adam@anope.org>
  *   Copyright (C) 2015 Daniel Vassdal <shutter@canternet.org>
- *   Copyright (C) 2013, 2016-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2016-2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2015 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
  *   Copyright (C) 2007, 2009-2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Oliver Lupton <om@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -186,7 +186,7 @@ class SQLConn : public SQL::Provider, public EventHandler
  public:
        reference<ConfigTag> conf;      /* The <database> entry */
        std::deque<QueueItem> queue;
-       PGconn*                 sql;            /* PgSQL database connection handle */
+       PGconn*                 sql;            /* PgSQL database connection handle */
        SQLstatus               status;         /* PgSQL database connection status */
        QueueItem               qinprog;        /* If there is currently a query in progress */
 
@@ -198,10 +198,7 @@ class SQLConn : public SQL::Provider, public EventHandler
                , qinprog(NULL, "")
        {
                if (!DoConnect())
-               {
-                       ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "WARNING: Could not connect to database " + tag->getString("id"));
                        DelayReconnect();
-               }
        }
 
        CullResult cull() CXX11_OVERRIDE
@@ -225,6 +222,7 @@ class SQLConn : public SQL::Provider, public EventHandler
                        q->OnError(err);
                        delete q;
                }
+               Close();
        }
 
        void OnEventHandlerRead() CXX11_OVERRIDE
@@ -270,34 +268,40 @@ class SQLConn : public SQL::Provider, public EventHandler
                return conninfo.str();
        }
 
+       bool HandleConnectError(const char* reason)
+       {
+               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Could not connect to the \"%s\" database: %s",
+                       GetId().c_str(), reason);
+               return false;
+       }
+
        bool DoConnect()
        {
                sql = PQconnectStart(GetDSN().c_str());
                if (!sql)
-                       return false;
+                       return HandleConnectError("PQconnectStart returned NULL");
 
                if(PQstatus(sql) == CONNECTION_BAD)
-                       return false;
+                       return HandleConnectError("connection status is bad");
 
                if(PQsetnonblocking(sql, 1) == -1)
-                       return false;
+                       return HandleConnectError("unable to mark fd as non-blocking");
 
                /* OK, we've initialised the connection, now to get it hooked into the socket engine
                * and then start polling it.
                */
-               this->fd = PQsocket(sql);
-
-               if(this->fd <= -1)
-                       return false;
+               SetFd(PQsocket(sql));
+               if(!HasFd())
+                       return HandleConnectError("PQsocket returned an invalid fd");
 
                if (!SocketEngine::AddFd(this, FD_WANT_NO_WRITE | FD_WANT_NO_READ))
-               {
-                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "BUG: Couldn't add pgsql socket to socket engine");
-                       return false;
-               }
+                       return HandleConnectError("could not add the pgsql socket to the socket engine");
 
                /* Socket all hooked into the engine, now to tell PgSQL to start connecting */
-               return DoPoll();
+               if (!DoPoll())
+                       return HandleConnectError("could not poll the connection state");
+
+               return true;
        }
 
        bool DoPoll()
@@ -506,7 +510,9 @@ restart:
        void Close()
        {
                status = DEAD;
-               SocketEngine::DelFd(this);
+
+               if (HasFd() && SocketEngine::HasFd(GetFd()))
+                       SocketEngine::DelFd(this);
 
                if(sql)
                {
@@ -551,8 +557,13 @@ class ModulePgSQL : public Module
                        if (curr == connections.end())
                        {
                                SQLConn* conn = new SQLConn(this, i->second);
-                               conns.insert(std::make_pair(id, conn));
-                               ServerInstance->Modules->AddService(*conn);
+                               if (conn->status != DEAD)
+                               {
+                                       conns.insert(std::make_pair(id, conn));
+                                       ServerInstance->Modules->AddService(*conn);
+                               }
+                               // If the connection is dead it has already been queued for culling
+                               // at the end of the main loop so we don't need to delete it here.
                        }
                        else
                        {
@@ -620,16 +631,15 @@ void SQLConn::DelayReconnect()
 {
        status = DEAD;
        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);
-               }
+       ServerInstance->GlobalCulls.AddItem((EventHandler*)this);
+       if (!mod->retimer)
+       {
+               mod->retimer = new ReconnectTimer(mod);
+               ServerInstance->Timers.AddTimer(mod->retimer);
        }
 }