m_spanningtree Remove split servers from the hash maps in TreeServer::SQuitInternal()

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

diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp
index 63eb6d3ee7bb36c2e050d17b198eace1d38ef288..c35f0d07a0c7cd082071aa97bd5485c5016a2ee9 100644 (file)
--- a/src/modules/m_xline_db.cpp
+++ b/src/modules/m_xline_db.cpp
@@ -31,7 +31,7 @@ class ModuleXLineDB : public Module
        {
                /* Load the configuration
                 * Note:
-                *              this is on purpose not in the OnRehash() method. It would be non-trivial to change the database on-the-fly.
+                *              This is on purpose not changed on a rehash. It would be non-trivial to change the database on-the-fly.
                 *              Imagine a scenario where the new file already exists. Merging the current XLines with the existing database is likely a bad idea
                 *              ...and so is discarding all current in-memory XLines for the ones in the database.
                 */
@@ -135,12 +135,7 @@ class ModuleXLineDB : public Module
                stream.close();
 
 #ifdef _WIN32
-               if (remove(xlinedbpath.c_str()))
-               {
-                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Cannot remove old database! %s (%d)", strerror(errno), errno);
-                       ServerInstance->SNO->WriteToSnoMask('a', "database: cannot remove old database: %s (%d)", strerror(errno), errno);
-                       return false;
-               }
+               remove(xlinedbpath.c_str());
 #endif
                // Use rename to move temporary to new db - this is guarenteed not to fuck up, even in case of a crash.
                if (rename(xlinenewdbpath.c_str(), xlinedbpath.c_str()) < 0)
@@ -156,7 +151,7 @@ class ModuleXLineDB : public Module
        bool ReadDatabase()
        {
                // If the xline database doesn't exist then we don't need to load it.
-               if (!ServerConfig::FileExists(xlinedbpath.c_str()))
+               if (!FileSystem::FileExists(xlinedbpath))
                        return true;
 
                std::ifstream stream(xlinedbpath.c_str());
@@ -166,7 +161,7 @@ class ModuleXLineDB : public Module
                        ServerInstance->SNO->WriteToSnoMask('a', "database: cannot read db: %s (%d)", strerror(errno), errno);
                        return false;
                }
-               
+
                std::string line;
                while (std::getline(stream, line))
                {