X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_restart.cpp;h=106531e792b98d98b9574c5632b615fdc12c84d5;hb=187ece1bab24da3e9fda31053aaa04c5e4c401f9;hp=baf5104f9c4ef781b9d7c46e315779a17807890e;hpb=09afa5085614e0224a296abd082fce205003c3fe;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_restart.cpp b/src/cmd_restart.cpp
index baf5104f9..106531e79 100644
--- a/src/cmd_restart.cpp
+++ b/src/cmd_restart.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -16,48 +13,38 @@
 
 #include "configreader.h"
 #include "users.h"
-#include "commands.h"
-#include "helperfuncs.h"
 #include "commands/cmd_restart.h"
 
-extern InspIRCd* ServerInstance;;
 
-void cmd_restart::Handle (const char** parameters, int pcnt, userrec *user)
+
+extern "C" command_t* init_command(InspIRCd* Instance)
 {
-	char *argv[32];
-	log(DEFAULT,"Restart: %s",user->nick);
+	return new cmd_restart(Instance);
+}
+
+CmdResult cmd_restart::Handle (const char** parameters, int pcnt, userrec *user)
+{
+	ServerInstance->Log(DEFAULT,"Restart: %s",user->nick);
 	if (!strcmp(parameters[0],ServerInstance->Config->restartpass))
 	{
-		WriteOpers("*** RESTART command from %s!%s@%s, restarting server.",user->nick,user->ident,user->host);
+		ServerInstance->WriteOpers("*** RESTART command from %s!%s@%s, restarting server.",user->nick,user->ident,user->host);
 
-		argv[0] = ServerInstance->Config->MyExecutable;
-		argv[1] = "-wait";
-		if (ServerInstance->Config->nofork)
+		try
 		{
-			argv[2] = "-nofork";
+			ServerInstance->Restart("Server restarting.");
 		}
-		else
+		catch (CoreException &e)
 		{
-			argv[2] = NULL;
+			/* We dont actually get here unless theres some fatal and unrecoverable error. */
+			exit(0);
 		}
-		argv[3] = NULL;
-		
-		// close ALL file descriptors
-		send_error("Server restarting.");
-		sleep(1);
-		for (int i = 0; i < MAX_DESCRIPTORS; i++)
-		{
-			shutdown(i,2);
-    			close(i);
-		}
-		sleep(2);
-		
-		execv(ServerInstance->Config->MyExecutable,argv);
-
-		exit(0);
 	}
 	else
 	{
-		WriteOpers("*** Failed RESTART Command from %s!%s@%s.",user->nick,user->ident,user->host);
+		ServerInstance->WriteOpers("*** Failed RESTART Command from %s!%s@%s.",user->nick,user->ident,user->host);
+		return CMD_FAILURE;
 	}
+
+	return CMD_SUCCESS;
 }
+