Add more comments.

Catch CoreException in cmd_restart, and if we catch one, just exit(0). Theres very little else we could do.


git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6070 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 31 insertions, 11 deletions

diff --git a/src/cmd_restart.cpp b/src/cmd_restart.cpp
index 73bfce298..106531e79 100644
--- a/src/cmd_restart.cpp
+++ b/src/cmd_restart.cpp
@@ -28,7 +28,16 @@ CmdResult cmd_restart::Handle (const char** parameters, int pcnt, userrec *user)
 	if (!strcmp(parameters[0],ServerInstance->Config->restartpass))
 	{
 		ServerInstance->WriteOpers("*** RESTART command from %s!%s@%s, restarting server.",user->nick,user->ident,user->host);
-		ServerInstance->Restart("Server restarting");
+
+		try
+		{
+			ServerInstance->Restart("Server restarting.");
+		}
+		catch (CoreException &e)
+		{
+			/* We dont actually get here unless theres some fatal and unrecoverable error. */
+			exit(0);
+		}
 	}
 	else
 	{
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index e5b9fe1eb..39a48a313 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -71,30 +71,41 @@ void InspIRCd::Restart(const std::string &reason)
 	std::vector<std::string> mymodnames;
 	int MyModCount = ModCount;
 
+	/* SendError flushes each client's queue,
+	 * regardless of writeability state
+	 */
 	this->SendError(reason);
 
-	this->Log(DEBUG,"Closing listening client sockets...");
 	for (unsigned int i = 0; i < stats->BoundPortCount; i++)
 		/* This calls the constructor and closes the listening socket */
 		delete Config->openSockfd[i];
 
-	/* Unload all modules, so they get a chance to clean up their listeners */
-	for (int j = 0; j < ModCount; j++)
-		mymodnames.push_back(Config->module_names[j]);
+	/* We do this twice, so that any service providers get a chance to be
+	 * unhooked by the modules using them, but then get a chance to be
+	 * removed themsleves.
+	 */
+	for (int tries = 0; tries < 2; tries++)
+	{
+		mymodnames.clear();
 
-	this->Log(DEBUG,"Unloading modules...");
-	for (int k = 0; k < MyModCount; k++)
-		this->UnloadModule(mymodnames[k].c_str());
+		/* Unload all modules, so they get a chance to clean up their listeners */
+		for (int j = 0; j < ModCount; j++)
+			mymodnames.push_back(Config->module_names[j]);
 
-	this->Log(DEBUG,"Closing client sockets...");
+		for (int k = 0; k < MyModCount; k++)
+			this->UnloadModule(mymodnames[k].c_str());
+	}
+
+	/* Close all client sockets, or the new process inherits them */
 	for (std::vector<userrec*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
 		(*i)->CloseSocket();
 
+	/* Figure out our filename (if theyve renamed it, we're boned) */
 	std::string me = Config->MyDir + "/inspircd";
 
-	this->Log(DEBUG,"Closing log and calling execv to start new instance of '%s'...", me.c_str());
-
+	/* Close logging */
 	this->Logger->Close();
+
 	if (execv(me.c_str(), Config->argv) == -1)
 	{
 		/* Will raise a SIGABRT if not trapped */