X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_xline_db.cpp;h=2237b0d081e8036217606e7a3c22de29d7b0942e;hb=aec9540601a8ca8632d0a4e0c4cec1484cfef99a;hp=683c14afa408fedf96fcdd82ddad23d8dc4a37fc;hpb=74ee9af96639323d852a8b15be72ee9974e0a826;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp index 683c14afa..2237b0d08 100644 --- a/src/modules/m_xline_db.cpp +++ b/src/modules/m_xline_db.cpp @@ -21,21 +21,32 @@ #include "inspircd.h" #include "xline.h" +/* $ModConfig: + * Specify the filename for the xline database here*/ /* $ModDesc: Keeps a dynamic log of all XLines created, and stores them in a seperate conf file (xline.db). */ class ModuleXLineDB : public Module { - std::vector 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. + * Imagine a scenario where the new file already exists. Merging the current XLines with the existing database is likely a bad idea + * ...and so is discarding all current in-memory XLines for the ones in the database. + */ + 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() @@ -49,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. @@ -65,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::iterator i = xlines.begin(); i != xlines.end(); i++) + if (dirty) { - if ((*i) == line) - { - xlines.erase(i); - break; - } + if (WriteDatabase()) + dirty = false; } - - WriteDatabase(); } bool WriteDatabase() @@ -99,7 +98,8 @@ class ModuleXLineDB : public Module * -- w00t */ ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Opening temporary database"); - f = fopen("data/xline.db.new", "w"); + std::string xlinenewdbpath = xlinedbpath + ".new"; + f = fopen(xlinenewdbpath.c_str(), "w"); if (!f) { ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot create database! %s (%d)", strerror(errno), errno); @@ -119,12 +119,19 @@ class ModuleXLineDB : public Module fprintf(f, "VERSION 1\n"); // Now, let's write. - XLine *line; - for (std::vector::iterator i = xlines.begin(); i != xlines.end(); i++) + std::vector types = ServerInstance->XLines->GetAllTypes(); + for (std::vector::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.."); @@ -139,8 +146,11 @@ class ModuleXLineDB : public Module return false; } +#ifdef _WIN32 + 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("data/xline.db.new", "data/xline.db") < 0) + if (rename(xlinenewdbpath.c_str(), xlinedbpath.c_str()) < 0) { ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: 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); @@ -154,9 +164,8 @@ class ModuleXLineDB : public Module { FILE *f; char linebuf[MAXBUF]; - unsigned int lineno = 0; - f = fopen("data/xline.db", "r"); + f = fopen(xlinedbpath.c_str(), "r"); if (!f) { if (errno == ENOENT) @@ -186,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++;