X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_xline_db.cpp;h=09a8c242d35a16723b663f3b60979e4bdbb32b58;hb=819147178db00008a215670992d0f532dd57f9e5;hp=93b13029d23598908f1d48fd6f2d926b1b0dca19;hpb=95494e65270f9d52a09b458682dc41bf537d62aa;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp
index 93b13029d..09a8c242d 100644
--- 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.
@@ -19,12 +19,17 @@
 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
  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();
+		reading_db = false;
 	}
 
 	virtual ~ModuleXLineDB()
@@ -38,16 +43,13 @@ 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);
 
-		for (std::vector<XLine *>::iterator i = xlines.begin(); i != xlines.end(); i++)
+		if (!reading_db)
 		{
-			line = (*i);
-			ServerInstance->WriteOpers("%s %s %s %lu %lu :%s", line->type.c_str(), line->Displayable(),
-ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason);
+			WriteDatabase();
 		}
-
-		WriteDatabase();
 	}
 
 	/** Called whenever an xline is deleted.
@@ -57,6 +59,17 @@ ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason
 	 */
 	void OnDelLine(User* source, XLine* 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)
@@ -79,16 +92,16 @@ ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason
 		 * 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
@@ -105,17 +118,17 @@ ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason
 		{
 			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;
 		}
@@ -123,7 +136,7 @@ ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason
 		// 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;
 		}
@@ -148,7 +161,7 @@ ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason
 			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;
 			}
@@ -182,24 +195,26 @@ ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason
 				items++;
 			}
 
+			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;
 				}
 			}
 			else if (command_p[0] == "LINE")
 			{
-				//mercilessly stolen from spanningtree
-				XLineFactory* xlf = ServerInstance->XLines->GetFactory(command_p[0]);
+				// Mercilessly stolen from spanningtree
+				XLineFactory* xlf = ServerInstance->XLines->GetFactory(command_p[1]);
 
 				if (!xlf)
 				{
@@ -220,11 +235,11 @@ ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason
 		return true;
 	}
 
-	
+
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}
 };