* ---------------------------------------------------
*/
-#include "configreader.h"
-#include "users.h"
+#include "inspircd.h"
#include "commands/cmd_restart.h"
-
-
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
{
return new cmd_restart(Instance);
}
CmdResult cmd_restart::Handle (const char** parameters, int pcnt, userrec *user)
{
- char *argv[32];
ServerInstance->Log(DEFAULT,"Restart: %s",user->nick);
if (!strcmp(parameters[0],ServerInstance->Config->restartpass))
{
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 (...)
{
- argv[2] = NULL;
+ /* We dont actually get here unless theres some fatal and unrecoverable error. */
+ exit(0);
}
- argv[3] = NULL;
-
- // close ALL file descriptors
- ServerInstance->SendError("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
{