More deallocation-at-exit cleanup

[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 aff5bb16ee09eff6e0798a0a7f2444643a3e8b2b..d3a75a64cb301cea6ebbe95019405b897ecec07f 100644 (file)
--- a/src/modules/m_xline_db.cpp
+++ b/src/modules/m_xline_db.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -24,8 +24,8 @@ class ModuleXLineDB : public Module
  public:
        ModuleXLineDB(InspIRCd* Me) : Module(Me)
        {
-               Implementation eventlist[] = { I_OnAddLine, I_OnDelLine };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               Implementation eventlist[] = { I_OnAddLine, I_OnDelLine, I_OnExpireLine };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
 
                reading_db = true;
                ReadDatabase();
@@ -43,7 +43,7 @@ class ModuleXLineDB : public Module
         */
        void OnAddLine(User* source, XLine* line)
        {
-               ServerInstance->Log(DEBUG, "xlinedb: Adding a line");
+               ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Adding a line");
                xlines.push_back(line);
 
                if (!reading_db)
@@ -59,7 +59,17 @@ class ModuleXLineDB : public Module
         */
        void OnDelLine(User* source, XLine* line)
        {
-               ServerInstance->Log(DEBUG, "xlinedb: Removing a line");
+               RemoveLine(line);
+       }
+
+       void OnExpireLine(XLine *line)
+       {
+               RemoveLine(line);
+       }
+
+       void RemoveLine(XLine *line)
+       {
+               ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Removing a line");
                for (std::vector<XLine *>::iterator i = xlines.begin(); i != xlines.end(); i++)
                {
                        if ((*i) == line)
@@ -82,16 +92,16 @@ class ModuleXLineDB : public Module
                 * Technically, that means that this can block, but I have *never* seen that.
                 *              -- w00t
                 */
-               ServerInstance->Log(DEBUG, "xlinedb: Opening temporary database");
+               ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Opening temporary database");
                f = fopen("xline.db.new", "w");
                if (!f)
                {
-                       ServerInstance->Log(DEBUG, "xlinedb: Cannot create database! %s (%d)", strerror(errno), errno);
+                       ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot create database! %s (%d)", strerror(errno), errno);
                        ServerInstance->SNO->WriteToSnoMask('x', "database: cannot create new db: %s (%d)", strerror(errno), errno);
                        return false;
                }
 
-               ServerInstance->Log(DEBUG, "xlinedb: Opened. Writing..");
+               ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Opened. Writing..");
 
                /*
                 * Now, much as I hate writing semi-unportable formats, additional
@@ -108,17 +118,17 @@ class ModuleXLineDB : public Module
                {
                        line = (*i);
                        fprintf(f, "LINE %s %s %s %lu %lu :%s\n", line->type.c_str(), line->Displayable(),
-                               ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason);
+                               ServerInstance->Config->ServerName, (unsigned long)line->set_time, (unsigned long)line->duration, line->reason);
                }
 
-               ServerInstance->Log(DEBUG, "xlinedb: Finished writing XLines. Checking for error..");
+               ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Finished writing XLines. Checking for error..");
 
                int write_error = 0;
                write_error = ferror(f);
                write_error |= fclose(f);
                if (write_error)
                {
-                       ServerInstance->Log(DEBUG, "xlinedb: Cannot write to new database! %s (%d)", strerror(errno), errno);
+                       ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot write to new database! %s (%d)", strerror(errno), errno);
                        ServerInstance->SNO->WriteToSnoMask('x', "database: cannot write to new db: %s (%d)", strerror(errno), errno);
                        return false;
                }
@@ -126,7 +136,7 @@ class ModuleXLineDB : public Module
                // Use rename to move temporary to new db - this is guarenteed not to fuck up, even in case of a crash.
                if (rename("xline.db.new", "xline.db") < 0)
                {
-                       ServerInstance->Log(DEBUG, "xlinedb: Cannot move new to old database! %s (%d)", strerror(errno), errno);
+                       ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot move new to old database! %s (%d)", strerror(errno), errno);
                        ServerInstance->SNO->WriteToSnoMask('x', "database: cannot replace old with new db: %s (%d)", strerror(errno), errno);
                        return false;
                }
@@ -151,7 +161,7 @@ class ModuleXLineDB : public Module
                        else
                        {
                                /* this might be slightly more problematic. */
-                               ServerInstance->Log(DEBUG, "xlinedb: Cannot read database! %s (%d)", strerror(errno), errno);
+                               ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot read database! %s (%d)", strerror(errno), errno);
                                ServerInstance->SNO->WriteToSnoMask('x', "database: cannot read db: %s (%d)", strerror(errno), errno);
                                return false;
                        }
@@ -185,18 +195,18 @@ class ModuleXLineDB : public Module
                                items++;
                        }
 
-                       ServerInstance->Log(DEBUG, "xlinedb: Processing %s", linebuf);
+                       ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Processing %s", linebuf);
 
                        if (command_p[0] == "VERSION")
                        {
                                if (command_p[1] == "1")
                                {
-                                       ServerInstance->Log(DEBUG, "xlinedb: Reading db version %s", command_p[1].c_str());
+                                       ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Reading db version %s", command_p[1].c_str());
                                }
                                else
                                {
                                        fclose(f);
-                                       ServerInstance->Log(DEBUG, "xlinedb: I got database version %s - I don't understand it", command_p[1].c_str());
+                                       ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: I got database version %s - I don't understand it", 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;
                                }
@@ -222,14 +232,15 @@ class ModuleXLineDB : public Module
                        }
                }
 
+               fclose(f);
                return true;
        }
 
-       
+
 
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
 };