From 4ced25a01fd50f459afece228816d0135d41be9c Mon Sep 17 00:00:00 2001 From: Daniel De Graaf Date: Sat, 12 Jun 2010 10:13:38 -0400 Subject: Quick fix for /RESTART crashing --- src/commands/cmd_restart.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'src/commands') diff --git a/src/commands/cmd_restart.cpp b/src/commands/cmd_restart.cpp index 79dc27e4d..d47cfb23d 100644 --- a/src/commands/cmd_restart.cpp +++ b/src/commands/cmd_restart.cpp @@ -37,23 +37,16 @@ CmdResult CommandRestart::Handle (const std::vector& parameters, Us { ServerInstance->SNO->WriteGlobalSno('a', "RESTART command from %s!%s@%s, restarting server.", user->nick.c_str(), user->ident.c_str(), user->host.c_str()); - try - { - ServerInstance->Restart("Server restarting."); - } - catch (...) - { - /* We dont actually get here unless theres some fatal and unrecoverable error. */ - exit(0); - } + ServerInstance->SendError("Server restarting."); + execv(ServerInstance->Config->cmdline.argv[0], ServerInstance->Config->cmdline.argv); + ServerInstance->SNO->WriteGlobalSno('a', "Failed RESTART - could not execute '%s' (%s)", + ServerInstance->Config->cmdline.argv[0], strerror(errno)); } else { ServerInstance->SNO->WriteGlobalSno('a', "Failed RESTART Command from %s!%s@%s.", user->nick.c_str(), user->ident.c_str(), user->host.c_str()); - return CMD_FAILURE; } - - return CMD_SUCCESS; + return CMD_FAILURE; } -- cgit v1.2.3