Add extra /map info (connection uptime, and lag time) to /MAP for opers. Adds feature...

[user/henk/code/inspircd.git] / src / cmd_restart.cpp

diff --git a/src/cmd_restart.cpp b/src/cmd_restart.cpp
index 2b8a7fc3ff779c1fd3abaa0b741a3a959c389db4..106531e792b98d98b9574c5632b615fdc12c84d5 100644 (file)
--- 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 ServerConfig* Config;;
 
-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);
-       if (!strcmp(parameters[0],Config->restartpass))
+       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] = Config->MyExecutable;
-               argv[1] = "-wait";
-               if (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(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;
 }
+