Use CommandBase::Params instead of std::vector<std::string>.

[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 222bbe17bd5020e1022efccd7571767b55d2dfe6..fb0c81d2fb4186169c30cd78b4aa634aaf5b5ea8 100644 (file)
--- a/src/modules/m_xline_db.cpp
+++ b/src/modules/m_xline_db.cpp
@@ -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('a', "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('a', "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('a', "database: cannot replace old xline db \"%s\" with new db \"%s\": %s (%d)", xlinedbpath.c_str(), xlinenewdbpath.c_str(), strerror(errno), errno);
                        return false;
                }
 
@@ -162,11 +152,11 @@ class ModuleXLineDB : public Module
                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('a', "database: cannot read xline db \"%s\": %s (%d)", xlinedbpath.c_str(), strerror(errno), errno);
                        return false;
                }
-               
+
                std::string line;
                while (std::getline(stream, line))
                {