Split up spanningtree some more, the filenames should be more intuitive so that devel...

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

diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp
index c5e87e6a0709c5c078d456c7aa7963ac0d1f273f..6025ea2b573a8d00dcdf22ec8c002bfc91ba92a9 100644 (file)
--- a/src/cmd_die.cpp
+++ b/src/cmd_die.cpp
@@ -11,12 +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);
 }
@@ -27,13 +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);
-               ServerInstance->SendError("*** DIE command from %s!%s@%s, terminating...", user->nick, user->nick, user->ident, user->dhost);
+               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);
                
                if (ServerInstance->Config->DieDelay)
                        sleep(ServerInstance->Config->DieDelay);
 
-               InspIRCd::Exit(EXIT_STATUS_DIE);
+               ServerInstance->Exit(EXIT_STATUS_DIE);
        }
        else
        {