From 39d2c7c6dfdc88097e5e06d63f7d906e28054469 Mon Sep 17 00:00:00 2001 From: om Date: Fri, 7 Apr 2006 23:16:45 +0000 Subject: Make WriteServ use WriteServ_NoFormat, code duplication = bad >:/ Change some weirdness using a stringstream for a simple append. Force a flush of all opers' write buffers after they get the oper notice about a /DIE git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3842 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/cmd_die.cpp | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'src/cmd_die.cpp') diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp index 3966021b5..bc8f58099 100644 --- a/src/cmd_die.cpp +++ b/src/cmd_die.cpp @@ -34,20 +34,35 @@ using namespace std; #include "cmd_die.h" extern ServerConfig* Config; +extern std::vector all_opers; void cmd_die::Handle (char **parameters, int pcnt, userrec *user) { - log(DEBUG,"die: %s",user->nick); if (!strcmp(parameters[0],Config->diepass)) { - WriteOpers("*** DIE command from %s!%s@%s, terminating...",user->nick,user->ident,user->host); + log(SPARSE, "/DIE command from %s!%s@%s, terminating in %d seconds...", user->nick, user->ident, user->host, Config->DieDelay); + + /* 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::iterator i = all_opers.begin(); i != all_opers.end(); i++) + { + userrec* a = *i; + + if (IS_LOCAL(a) && (a->modebits & UM_SERVERNOTICE)) + { + WriteServ(a->fd, "NOTICE %s :*** DIE command from %s!%s@%s, terminating...", a->nick, a->nick, a->ident, a->host); + a->FlushWriteBuf(); + } + } + sleep(Config->DieDelay); Exit(ERROR); } else { + log(SPARSE, "Failed /DIE command from %s!%s@%s", user->nick, user->ident, user->host); WriteOpers("*** Failed DIE Command from %s!%s@%s.",user->nick,user->ident,user->host); } } - - -- cgit v1.3.1-10-gc9f91