Allow configuring whether SETNAME sends snotices and is oper-only.

[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 df6f4c10c5e54e704362692dab16114546f7aba1..90f9de9d2958f1a98e5b489b7b709478da9f6c1d 100644 (file)
--- a/src/modules/m_xline_db.cpp
+++ b/src/modules/m_xline_db.cpp
@@ -31,12 +31,12 @@ 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.
                 */
                ConfigTag* Conf = ServerInstance->Config->ConfValue("xlinedb");
-               xlinedbpath = Conf->getString("filename", DATA_PATH "/xline.db");
+               xlinedbpath = ServerInstance->Config->Paths.PrependData(Conf->getString("filename", "xline.db"));
 
                // Read xlines before attaching to events
                ReadDatabase();
@@ -64,11 +64,6 @@ class ModuleXLineDB : public Module
                dirty = true;
        }
 
-       void OnExpireLine(XLine *line) CXX11_OVERRIDE
-       {
-               dirty = true;
-       }
-
        void OnBackgroundTimer(time_t now) CXX11_OVERRIDE
        {
                if (dirty)
@@ -91,8 +86,8 @@ class ModuleXLineDB : public Module
                std::ofstream stream(xlinenewdbpath.c_str());
                if (!stream.is_open())
                {
-                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Cannot create database! %s (%d)", strerror(errno), errno);
-                       ServerInstance->SNO->WriteToSnoMask('a', "database: cannot create new db: %s (%d)", strerror(errno), errno);
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Cannot create database \"%s\"! %s (%d)", xlinenewdbpath.c_str(), strerror(errno), errno);
+                       ServerInstance->SNO->WriteToSnoMask('x', "database: cannot create new xline db \"%s\": %s (%d)", xlinenewdbpath.c_str(), strerror(errno), errno);
                        return false;
                }
 
@@ -119,8 +114,8 @@ class ModuleXLineDB : public Module
                        {
                                XLine* line = i->second;
                                stream << "LINE " << line->type << " " << line->Displayable() << " "
-                                       << ServerInstance->Config->ServerName << " " << line->set_time << " "
-                                       << line->duration << " " << line->reason << std::endl;
+                                       << line->source << " " << line->set_time << " "
+                                       << line->duration << " :" << line->reason << std::endl;
                        }
                }
 
@@ -128,25 +123,20 @@ class ModuleXLineDB : public Module
 
                if (stream.fail())
                {
-                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Cannot write to new database! %s (%d)", strerror(errno), errno);
-                       ServerInstance->SNO->WriteToSnoMask('a', "database: cannot write to new db: %s (%d)", strerror(errno), errno);
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Cannot write to new database \"%s\"! %s (%d)", xlinenewdbpath.c_str(), strerror(errno), errno);
+                       ServerInstance->SNO->WriteToSnoMask('x', "database: cannot write to new xline db \"%s\": %s (%d)", xlinenewdbpath.c_str(), strerror(errno), errno);
                        return false;
                }
                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)
                {
-                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Cannot move new to old database! %s (%d)", strerror(errno), errno);
-                       ServerInstance->SNO->WriteToSnoMask('a', "database: cannot replace old with new db: %s (%d)", strerror(errno), errno);
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Cannot replace old database \"%s\" with new database \"%s\"! %s (%d)", xlinedbpath.c_str(), xlinenewdbpath.c_str(), strerror(errno), errno);
+                       ServerInstance->SNO->WriteToSnoMask('x', "database: cannot replace old xline db \"%s\" with new db \"%s\": %s (%d)", xlinedbpath.c_str(), xlinenewdbpath.c_str(), strerror(errno), errno);
                        return false;
                }
 
@@ -156,17 +146,17 @@ 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());
                if (!stream.is_open())
                {
-                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Cannot read database! %s (%d)", strerror(errno), errno);
-                       ServerInstance->SNO->WriteToSnoMask('a', "database: cannot read db: %s (%d)", strerror(errno), errno);
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Cannot read database \"%s\"! %s (%d)", xlinedbpath.c_str(), strerror(errno), errno);
+                       ServerInstance->SNO->WriteToSnoMask('x', "database: cannot read xline db \"%s\": %s (%d)", xlinedbpath.c_str(), strerror(errno), errno);
                        return false;
                }
-               
+
                std::string line;
                while (std::getline(stream, line))
                {
@@ -176,7 +166,7 @@ class ModuleXLineDB : public Module
                        std::string command_p[7];
                        std::string tmp;
 
-                       while (tokens.GetToken(tmp) && (items < 7))
+                       while (tokens.GetTrailing(tmp) && (items < 7))
                        {
                                command_p[items] = tmp;
                                items++;
@@ -190,7 +180,7 @@ class ModuleXLineDB : public Module
                                {
                                        stream.close();
                                        ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "I got database version %s - I don't understand it", command_p[1].c_str());
-                                       ServerInstance->SNO->WriteToSnoMask('a', "database: I got a database version (%s) I don't understand", command_p[1].c_str());
+                                       ServerInstance->SNO->WriteToSnoMask('x', "database: I got a database version (%s) I don't understand", command_p[1].c_str());
                                        return false;
                                }
                        }
@@ -201,7 +191,7 @@ class ModuleXLineDB : public Module
 
                                if (!xlf)
                                {
-                                       ServerInstance->SNO->WriteToSnoMask('a', "database: Unknown line type (%s).", command_p[1].c_str());
+                                       ServerInstance->SNO->WriteToSnoMask('x', "database: Unknown line type (%s).", command_p[1].c_str());
                                        continue;
                                }