X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=70e5fcf38649b93102b42cbc911f7dbf42c5f22b;hb=6a0155101e09ecf48858d73dab17400777cbe668;hp=aa3fb961231739a593cc4de41798b79fb43be319;hpb=58a0a7e01422e62de1565a8eb0a1febdc463d04d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index aa3fb9612..70e5fcf38 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -30,7 +30,6 @@
 #include <signal.h>
 
 #ifndef _WIN32
-	#include <dirent.h>
 	#include <unistd.h>
 	#include <sys/resource.h>
 	#include <dlfcn.h>
@@ -47,7 +46,6 @@
 #include <iostream>
 #include "xline.h"
 #include "exitcodes.h"
-#include "testsuite.h"
 
 InspIRCd* ServerInstance = NULL;
 
@@ -78,13 +76,6 @@ const char* ExitCodes[] =
 		"Received SIGTERM"						// 10
 };
 
-#ifdef INSPIRCD_ENABLE_TESTSUITE
-/** True if we have been told to run the testsuite from the commandline,
- * rather than entering the mainloop.
- */
-static int do_testsuite = 0;
-#endif
-
 template<typename T> static void DeleteZero(T*&n)
 {
 	T* t = n;
@@ -102,6 +93,12 @@ void InspIRCd::Cleanup()
 	}
 	ports.clear();
 
+	// Disconnect all local users
+	const std::string quitmsg = "Server shutting down";
+	const UserManager::LocalList& list = Users.GetLocalUsers();
+	while (!list.empty())
+		ServerInstance->Users.QuitUser(list.front(), quitmsg);
+
 	GlobalCulls.Apply();
 	Modules->UnloadAll();
 
@@ -123,10 +120,11 @@ void InspIRCd::SetSignals()
 {
 #ifndef _WIN32
 	signal(SIGALRM, SIG_IGN);
+	signal(SIGCHLD, SIG_IGN);
 	signal(SIGHUP, InspIRCd::SetSignal);
 	signal(SIGPIPE, SIG_IGN);
-	signal(SIGCHLD, SIG_IGN);
-	/* We want E2BIG not a signal! */
+	signal(SIGUSR1, SIG_IGN);
+	signal(SIGUSR2, SIG_IGN);
 	signal(SIGXFSZ, SIG_IGN);
 #endif
 	signal(SIGTERM, InspIRCd::SetSignal);
@@ -192,9 +190,7 @@ void InspIRCd::WritePID(const std::string& filename, bool exitonfail)
 		return;
 	}
 
-	std::string fname(filename);
-	if (fname.empty())
-		fname = ServerInstance->Config->Paths.PrependData("inspircd.pid");
+	std::string fname = ServerInstance->Config->Paths.PrependData(filename.empty() ? "inspircd.pid" : filename);
 	std::ofstream outfile(fname.c_str());
 	if (outfile.is_open())
 	{
@@ -290,9 +286,6 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 		{ "nopid",	no_argument,		&do_nopid,	1	},
 		{ "runasroot",	no_argument,		&do_root,	1	},
 		{ "version",	no_argument,		&do_version,	1	},
-#ifdef INSPIRCD_ENABLE_TESTSUITE
-		{ "testsuite",	no_argument,		&do_testsuite,	1	},
-#endif
 		{ 0, 0, 0, 0 }
 	};
 
@@ -330,11 +323,6 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 		}
 	}
 
-#ifdef INSPIRCD_ENABLE_TESTSUITE
-	if (do_testsuite)
-		do_nofork = do_debug = true;
-#endif
-
 	if (do_version)
 	{
 		std::cout << std::endl << INSPIRCD_VERSION << std::endl;
@@ -442,7 +430,6 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
 	// Build ISupport as ModuleManager::LoadAll() does not do it
 	this->ISupport.Build();
-	Config->ApplyDisabledCommands();
 
 	if (!pl.empty())
 	{
@@ -586,16 +573,6 @@ void InspIRCd::UpdateTime()
 
 void InspIRCd::Run()
 {
-#ifdef INSPIRCD_ENABLE_TESTSUITE
-	/* See if we're supposed to be running the test suite rather than entering the mainloop */
-	if (do_testsuite)
-	{
-		TestSuite* ts = new TestSuite;
-		delete ts;
-		return;
-	}
-#endif
-
 	UpdateTime();
 	time_t OLDTIME = TIME.tv_sec;
 
@@ -644,14 +621,15 @@ void InspIRCd::Run()
 			}
 #endif
 
-			/* Allow a buffer of two seconds drift on this so that ntpdate etc dont harass admins */
-			if (TIME.tv_sec < OLDTIME - 2)
+			if (Config->TimeSkipWarn)
 			{
-				SNO->WriteToSnoMask('a', "\002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %lu secs.", (unsigned long)(OLDTIME-TIME.tv_sec));
-			}
-			else if (TIME.tv_sec > OLDTIME + 2)
-			{
-				SNO->WriteToSnoMask('a', "\002EH?!\002 -- Time is jumping FORWARDS! Clock skipped %lu secs.", (unsigned long)(TIME.tv_sec - OLDTIME));
+				time_t timediff = TIME.tv_sec - OLDTIME;
+
+				if (timediff > Config->TimeSkipWarn)
+					SNO->WriteToSnoMask('a', "\002Performance warning!\002 Server clock jumped forwards by %lu seconds!", timediff);
+
+				else if (timediff < -Config->TimeSkipWarn)
+					SNO->WriteToSnoMask('a', "\002Performance warning!\002 Server clock jumped backwards by %lu seconds!", labs(timediff));
 			}
 
 			OLDTIME = TIME.tv_sec;