Merge branch 'development'

[NeonServV5.git] / src / EventLogger.c

diff --git a/src/EventLogger.c b/src/EventLogger.c
index 097ac955c965971e5757ff21fee4a59bb2e1e130..e131478b54bc8d8379e2dcb54ae947c224a455ec 100644 (file)
--- a/src/EventLogger.c
+++ b/src/EventLogger.c
@@ -1,5 +1,5 @@
-/* EventLogger.c - NeonServ v5.2
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* EventLogger.c - NeonServ v5.6
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,21 +21,22 @@
 #include "UserNode.h"
 #include "ChanNode.h"
 #include "DBHelper.h"
+#include "log.h"
 
 static struct Event *first_event = NULL, *last_event = NULL;
 
-struct Event *createEvent(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, char *command, char **args, int argc, int flags) {
+struct Event *createEvent(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, struct cmd_binding *command, char **args, int argc, int flags) {
     struct Event *event = malloc(sizeof(*event));
     if (!event)
     {
-        perror("malloc() failed");
+        printf_log("main", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__);
         return NULL;
     }
     event->client = client;
     event->user = user;
     event->chan = chan;
     event->event_time = time(0);
-    event->command = strdup(command);
+    event->command = command;
     char arguments[MAXLEN];
     int argpos = 0;
     int i;
@@ -57,7 +58,7 @@ struct Event *createEvent(struct ClientSocket *client, struct UserNode *user, st
 
 void logEvent(struct Event *event) {
     char fullcmd[MAXLEN];
-    sprintf(fullcmd, "%s %s", event->command, event->arguments);
+    sprintf(fullcmd, "%s %s", event->command->func->name, event->arguments);
     if((event->flags & CMDFLAG_LOG) && event->chan) {
         char *auth = ((event->user->flags & USERFLAG_ISAUTHED) ? event->user->auth : "*");
         loadChannelSettings(event->chan);
@@ -80,6 +81,7 @@ void logEvent(struct Event *event) {
             if((event->chan->flags & CHANFLAG_CHAN_REGISTERED))
                 printf_mysql_query("INSERT INTO `godlog` (`godlog_cid`, `godlog_uid`, `godlog_time`, `godlog_cmd`) VALUES ('%d', '%d', UNIX_TIMESTAMP(), '%s')", event->chan->channel_id, userid, escape_string(fullcmd));
         }
+        printf_log("main", LOG_OVERRIDE, "[%s:%s (%s)] %s", (event->chan ? event->chan->name : "*"), event->user->nick, auth, fullcmd);
     }
 }
 
@@ -92,7 +94,6 @@ static void destroyEvent(struct Event *event) {
             if(last->next == NULL) break;
         last_event = last;
     }
-    free(event->command);
     free(event->arguments);
     free(event);
 }