Merge pull request #1328 from Adam-/insp20+sakick

[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 6caae07d7d1e67ff3071325cbc7cec8852d6e5c4..2237b0d081e8036217606e7a3c22de29d7b0942e 100644 (file)
--- a/src/modules/m_xline_db.cpp
+++ b/src/modules/m_xline_db.cpp
@@ -27,15 +27,11 @@
 
 class ModuleXLineDB : public Module
 {
-       std::vector<XLine *> xlines;
-       bool reading_db;                        // If this is true, addlines are as a result of db reading, so don't bother flushing the db to disk.
-                                               // DO REMEMBER TO SET IT, otherwise it's annoying :P
+       bool dirty;
        std::string xlinedbpath;
  public:
-       ModuleXLineDB()         {
-               Implementation eventlist[] = { I_OnAddLine, I_OnDelLine, I_OnExpireLine };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
-
+       void init()
+       {
                /* 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.
@@ -44,10 +40,13 @@ class ModuleXLineDB : public Module
                 */
                ConfigTag* Conf = ServerInstance->Config->ConfValue("xlinedb");
                xlinedbpath = Conf->getString("filename", DATA_PATH "/xline.db");
-               
-               reading_db = true;
+
+               // Read xlines before attaching to events
                ReadDatabase();
-               reading_db = false;
+
+               Implementation eventlist[] = { I_OnAddLine, I_OnDelLine, I_OnExpireLine, I_OnBackgroundTimer };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+               dirty = false;
        }
 
        virtual ~ModuleXLineDB()
@@ -61,13 +60,7 @@ class ModuleXLineDB : public Module
         */
        void OnAddLine(User* source, XLine* line)
        {
-               ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Adding a line");
-               xlines.push_back(line);
-
-               if (!reading_db)
-               {
-                       WriteDatabase();
-               }
+               dirty = true;
        }
 
        /** Called whenever an xline is deleted.
@@ -77,27 +70,21 @@ class ModuleXLineDB : public Module
         */
        void OnDelLine(User* source, XLine* line)
        {
-               RemoveLine(line);
+               dirty = true;
        }
 
        void OnExpireLine(XLine *line)
        {
-               RemoveLine(line);
+               dirty = true;
        }
 
-       void RemoveLine(XLine *line)
+       void OnBackgroundTimer(time_t now)
        {
-               ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Removing a line");
-               for (std::vector<XLine *>::iterator i = xlines.begin(); i != xlines.end(); i++)
+               if (dirty)
                {
-                       if ((*i) == line)
-                       {
-                               xlines.erase(i);
-                               break;
-                       }
+                       if (WriteDatabase())
+                               dirty = false;
                }
-
-               WriteDatabase();
        }
 
        bool WriteDatabase()
@@ -132,12 +119,19 @@ class ModuleXLineDB : public Module
                fprintf(f, "VERSION 1\n");
 
                // Now, let's write.
-               XLine *line;
-               for (std::vector<XLine *>::iterator i = xlines.begin(); i != xlines.end(); i++)
+               std::vector<std::string> types = ServerInstance->XLines->GetAllTypes();
+               for (std::vector<std::string>::const_iterator it = types.begin(); it != types.end(); ++it)
                {
-                       line = (*i);
-                       fprintf(f, "LINE %s %s %s %lu %lu :%s\n", line->type.c_str(), line->Displayable(),
-                               ServerInstance->Config->ServerName.c_str(), (unsigned long)line->set_time, (unsigned long)line->duration, line->reason.c_str());
+                       XLineLookup* lookup = ServerInstance->XLines->GetAll(*it);
+                       if (!lookup)
+                               continue; // Not possible as we just obtained the list from XLineManager
+
+                       for (LookupIter i = lookup->begin(); i != lookup->end(); ++i)
+                       {
+                               XLine* line = i->second;
+                               fprintf(f, "LINE %s %s %s %lu %lu :%s\n", line->type.c_str(), line->Displayable(),
+                                       ServerInstance->Config->ServerName.c_str(), (unsigned long)line->set_time, (unsigned long)line->duration, line->reason.c_str());
+                       }
                }
 
                ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Finished writing XLines. Checking for error..");
@@ -153,12 +147,7 @@ class ModuleXLineDB : public Module
                }
 
 #ifdef _WIN32
-               if (remove(xlinedbpath.c_str()))
-               {
-                       ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: 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)
@@ -175,7 +164,6 @@ class ModuleXLineDB : public Module
        {
                FILE *f;
                char linebuf[MAXBUF];
-               unsigned int lineno = 0;
 
                f = fopen(xlinedbpath.c_str(), "r");
                if (!f)
@@ -207,16 +195,14 @@ class ModuleXLineDB : public Module
 
                                c++;
                        }
-                       // Smart man might think of initing to 1, and moving this to the bottom. Don't. We use continue in this loop.
-                       lineno++;
 
                        // Inspired by the command parser. :)
                        irc::tokenstream tokens(linebuf);
                        int items = 0;
-                       std::string command_p[MAXPARAMETERS];
+                       std::string command_p[7];
                        std::string tmp;
 
-                       while (tokens.GetToken(tmp) && (items < MAXPARAMETERS))
+                       while (tokens.GetToken(tmp) && (items < 7))
                        {
                                command_p[items] = tmp;
                                items++;