X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_xline_db.cpp;h=90f9de9d2958f1a98e5b489b7b709478da9f6c1d;hb=318d50bc868fb64a7d5e1edeff3ec23e38925638;hp=c35f0d07a0c7cd082071aa97bd5485c5016a2ee9;hpb=f62654a6859998f9d63eb22702c572d5ebcff15c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp
index c35f0d07a..90f9de9d2 100644
--- 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('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,8 +123,8 @@ 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();
@@ -140,8 +135,8 @@ 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(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;
 		}
 
@@ -157,8 +152,8 @@ 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('x', "database: cannot read xline db \"%s\": %s (%d)", xlinedbpath.c_str(), strerror(errno), errno);
 			return false;
 		}
 
@@ -171,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++;
@@ -185,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;
 				}
 			}
@@ -196,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;
 				}