ok, trying to work on blockheap's stuff

[irc/rqf/shadowircd.git] / src / restart.c

diff --git a/src/restart.c b/src/restart.c
index 4ccfb76a5a13af2306504ceab5a12b672bc53f08..2f7b4b9d101aa6297221e3dee688c2d05a451977 100644 (file)
--- a/src/restart.c
+++ b/src/restart.c
@@ -21,18 +21,16 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: restart.c 486 2006-01-15 10:36:32Z nenolod $
+ *  $Id: restart.c 3354 2007-04-03 09:21:31Z nenolod $
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "restart.h"
 #include "common.h"
 #include "ircd.h"
 #include "send.h"
 #include "s_log.h"
 #include "client.h"            /* for FLAGS_ALL */
-#include "memory.h"
 
 /* external var */
 extern char **myargv;
@@ -46,7 +44,7 @@ restart(const char *mesg)
                abort();
        was_here = YES;
 
-       ilog(L_MAIN, "Restarting Server because: %s, memory data limit: %ld", mesg, get_maxrss());
+       ilog(L_MAIN, "Restarting Server because: %s", mesg);
 
        server_reboot();
 }
@@ -55,6 +53,7 @@ void
 server_reboot(void)
 {
        int i;
+       int maxconn = rb_get_maxconnections();
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "Restarting server...");
 
@@ -62,14 +61,14 @@ server_reboot(void)
        /*
         * XXX we used to call flush_connections() here. But since this routine
         * doesn't exist anymore, we won't be flushing. This is ok, since 
-        * when close handlers come into existance, comm_close() will be called
+        * when close handlers come into existance, rb_close() will be called
         * below, and the data flushing will be implicit.
         *    -- adrian
         *
         * bah, for now, the program ain't coming back to here, so forcibly
         * close everything the "wrong" way for now, and just LEAVE...
         */
-       for (i = 0; i < MAXCONNECTIONS; ++i)
+       for (i = 0; i < maxconn; ++i)
                close(i);
 
        unlink(pidFileName);