Merge branch 'insp3' into master.

1 files changed, 6 insertions, 26 deletions

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 52f5b9b5b..23e543dab 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -47,7 +47,6 @@
 #include <iostream>
 #include "xline.h"
 #include "exitcodes.h"
-#include "testsuite.h"
 
 InspIRCd* ServerInstance = NULL;
 
@@ -78,13 +77,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 +94,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();
 
@@ -290,9 +288,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 +325,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;
@@ -585,16 +575,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;