Merge branch 'development'

[NeonServV5.git] / src / signal.c

diff --git a/src/signal.c b/src/signal.c
index 9acfd2cdbde71374994c438a4f0b32be81b4819f..4e8f9a5d72f7a2a85ba77d186f549e5fd1e833a8 100644 (file)
--- a/src/signal.c
+++ b/src/signal.c
@@ -1,4 +1,4 @@
-/* signal.c - NeonServ v5.5
+/* signal.c - NeonServ v5.6
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -18,13 +18,15 @@
 #include "bots.h"
 #include "ChanNode.h"
 #include "ClientSocket.h"
+#include "IOHandler.h"
 #include "ConfigParser.h"
+#include "log.h"
 
 static void sigcrash();
 static void sigexit();
 
 void sighandler(int signum) {
-    putlog(LOGLEVEL_INFO, "Received Signal %d\n", signum);
+    printf_log("main", LOG_INFO, "Received Signal %d\n", signum);
     signal(signum, SIG_DFL);
     switch(signum) {
         case SIGABRT:
@@ -65,40 +67,30 @@ static void sigcrash(int signum) {
             signame = "SIGUNKNOWN";
             break;
     }
-    putlog(LOGLEVEL_ERROR, "NeonServ process crashed (%s)\n", signame);
+    printf_log("main", LOG_ERROR, "NeonServ process crashed (%s)\n", signame);
     #ifndef WIN32
     char gcore[50];
     sprintf(gcore, "gcore %u", getpid());
     int sysretn = system(gcore); //generate core file
     sprintf(coregen, "core file generated. (%d)", sysretn);
-    putlog(LOGLEVEL_ERROR | LOGLEVEL_INFO, "generated core file.\n");
+    printf_log("main", LOG_ERROR | LOG_INFO, "generated core file.\n");
     #endif
-    char *alertchan = get_string_field("General.alertchan");
-    if(alertchan) {
-        struct ChanNode *channel = getChanByName(alertchan);
-        struct ClientSocket *client;
-        if(channel && (client = getChannelBot(channel, 0))) {
-            putsock(client, "PRIVMSG %s :\00304NeonServ received signal %d (%s). %s", alertchan, signum, signame, coregen);
-        }
-    }
     //close all bots
     struct ClientSocket *bot;
     for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
         if((bot->flags & SOCKET_FLAG_CONNECTED)) {
-            close(bot->sock);
+            iohandler_close(bot->iofd);
             bot->flags &= ~(SOCKET_FLAG_CONNECTED | SOCKET_FLAG_READY);
+            bot->iofd = NULL;
         }
     }
-    putlog(LOGLEVEL_INFO, "hard shutdown...\n");
-    exit_daemon();
+    printf_log("main", LOG_INFO, "hard shutdown...\n");
     usleep(2000000);
     //hard restart
-    restart_process();
+    restart_bot(1);
     exit(0);
 }
 
 static void sigexit(int signum) {
-    cleanup();
-    exit_daemon();
-    exit(0);
+    stop_bot();
 }