Add a metric assload of TRANSLATE macros to modules.

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

diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp
index 9bebf3fe6414575ae7d788dd8d7ea44d2b145dfc..6025ea2b573a8d00dcdf22ec8c002bfc91ba92a9 100644 (file)
--- a/src/cmd_die.cpp
+++ b/src/cmd_die.cpp
@@ -11,11 +11,11 @@
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
-#include "users.h"
+#include "inspircd.h"
 #include "commands/cmd_die.h"
+#include "exitcodes.h"
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
        return new cmd_die(Instance);
 }
@@ -26,25 +26,14 @@ CmdResult cmd_die::Handle (const char** parameters, int pcnt, userrec *user)
 {
        if (!strcmp(parameters[0],ServerInstance->Config->diepass))
        {
-               ServerInstance->Log(SPARSE, "/DIE command from %s!%s@%s, terminating in %d seconds...", user->nick, user->ident, user->host, ServerInstance->Config->DieDelay);
+               std::string diebuf = std::string("*** DIE command from ") + user->nick + "!" + user->ident + "@" + user->dhost + ". Terminating in " + ConvToStr(ServerInstance->Config->DieDelay) + " seconds.";
+               ServerInstance->Log(SPARSE, diebuf);
+               ServerInstance->SendError(diebuf);
                
-               /* This would just be WriteOpers(), but as we just sleep() and then die then the write buffers never get flushed.
-                * so we iterate the oper list, writing the message and immediately trying to flush their write buffer.
-                */
-               
-               for (std::vector<userrec*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
-               {
-                       userrec* a = *i;
-                       
-                       if (IS_LOCAL(a) && (a->modes[UM_SERVERNOTICE]))
-                       {
-                               a->WriteServ("NOTICE %s :*** DIE command from %s!%s@%s, terminating...", a->nick, a->nick, a->ident, a->host);
-                               a->FlushWriteBuf();
-                       }
-               }
-               
-               sleep(ServerInstance->Config->DieDelay);
-               InspIRCd::Exit(ERROR);
+               if (ServerInstance->Config->DieDelay)
+                       sleep(ServerInstance->Config->DieDelay);
+
+               ServerInstance->Exit(EXIT_STATUS_DIE);
        }
        else
        {