diff options
| -rw-r--r-- | modules/database/db_flatfile.cpp | 41 | ||||
| -rw-r--r-- | src/init.cpp | 2 |
2 files changed, 40 insertions, 3 deletions
diff --git a/modules/database/db_flatfile.cpp b/modules/database/db_flatfile.cpp index 9c40c88f4..ae5e35647 100644 --- a/modules/database/db_flatfile.cpp +++ b/modules/database/db_flatfile.cpp @@ -10,6 +10,10 @@ #include "module.h" +#ifndef _WIN32 +#include <sys/wait.h> +#endif + class SaveData : public Serialize::Data { public: @@ -106,6 +110,8 @@ class DBFlatFile : public Module, public Pipe std::map<Anope::string, std::list<Anope::string> > backups; bool loaded; + int child_pid; + void BackupDatabase() { tm *tm = localtime(&Anope::CurTime); @@ -161,11 +167,31 @@ class DBFlatFile : public Module, public Pipe } public: - DBFlatFile(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, DATABASE | VENDOR), last_day(0), loaded(false) + DBFlatFile(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, DATABASE | VENDOR), last_day(0), loaded(false), child_pid(-1) { } +#ifndef _WIN32 + void OnRestart() anope_override + { + OnShutdown(); + } + + void OnShutdown() anope_override + { + if (child_pid > -1) + { + Log(this) << "Waiting for child to exit..."; + + int status; + waitpid(child_pid, &status, 0); + + Log(this) << "Done"; + } + } +#endif + void OnNotify() anope_override { char buf[512]; @@ -174,6 +200,8 @@ class DBFlatFile : public Module, public Pipe return; buf[i] = 0; + child_pid = -1; + if (!*buf) { Log(this) << "Finished saving databases"; @@ -238,15 +266,24 @@ class DBFlatFile : public Module, public Pipe void OnSaveDatabase() anope_override { + if (child_pid > -1) + { + Log(this) << "Database save is already in progress!"; + return; + } + BackupDatabase(); int i = -1; #ifndef _WIN32 - if (Config->GetModule(this)->Get<bool>("fork")) + if (!Anope::Quitting && Config->GetModule(this)->Get<bool>("fork")) { i = fork(); if (i > 0) + { + child_pid = i; return; + } else if (i < 0) Log(this) << "Unable to fork for database save"; } diff --git a/src/init.cpp b/src/init.cpp index 489f3b264..88e8af0fc 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -139,8 +139,8 @@ void Anope::HandleSignal() Log() << "Received signal " << Signal << ", exiting."; Anope::QuitReason = Anope::string("Services terminating via signal ") + stringify(Signal); #endif - Anope::SaveDatabases(); Anope::Quitting = true; + Anope::SaveDatabases(); break; } |