X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Ftest%2Fserv_test.c;h=a7834ae8e318b2e91c6ae9888a670651c55e070d;hb=7a9b0685e406cc83597171cc39d008c7e5459ca8;hp=b3b42c97d1489681ad0da36e744c421ab24969f3;hpb=8c47559cb5ae97ec0fa35660ee16fd61a9451c72;p=citadel.git

diff --git a/citadel/modules/test/serv_test.c b/citadel/modules/test/serv_test.c
index b3b42c97d..a7834ae8e 100644
--- a/citadel/modules/test/serv_test.c
+++ b/citadel/modules/test/serv_test.c
@@ -1,24 +1,16 @@
 /*
- * $Id$
+ * This is an empty skeleton of a Citadel server module, included to demonstrate
+ * how to add a new module to the system and how to activate it in the server.
+ * 
+ * Copyright (c) 1998-2016 by the citadel.org team
  *
- * A skeleton module to test the dynamic loader.
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
  *
- *
- * Copyright (c) 1998-2009 by the citadel.org team
- *
- *  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
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "sysdep.h"
@@ -30,46 +22,32 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
 #include "ctdl_module.h"
 
-extern struct CitContext *ContextList;
 
 void CleanupTest(void) {
-	CtdlLogPrintf(CTDL_DEBUG, "--- test of adding an unload hook --- \n");
-	}
+	syslog(LOG_DEBUG, "--- test of adding an unload hook --- \n");
+}
 
 void NewRoomTest(void) {
-	CtdlLogPrintf(CTDL_DEBUG, "--- test module was told we're now in a new room ---\n");
-	}
+	syslog(LOG_DEBUG, "--- test module was told we're now in a new room ---\n");
+}
 
 void SessionStartTest(void) {
-	CtdlLogPrintf(CTDL_DEBUG, "--- starting up session %d ---\n",
-		CC->cs_pid);
-	}
+	syslog(LOG_DEBUG, "--- starting up session %d ---\n", CC->cs_pid);
+}
 
 void SessionStopTest(void) {
-	CtdlLogPrintf(CTDL_DEBUG, "--- ending session %d ---\n", 
-		CC->cs_pid);
-	}
+	syslog(LOG_DEBUG, "--- ending session %d ---\n", CC->cs_pid);
+}
 
 void LoginTest(void) {
-	CtdlLogPrintf(CTDL_DEBUG, "--- Hello, %s ---\n", CC->curr_user);
-	}
+	syslog(LOG_DEBUG, "--- Hello, %s ---\n", CC->curr_user);
+}
 
 /* To insert this module into the server activate the next block by changing the #if 0 to #if 1 */
 CTDL_MODULE_INIT(test)
@@ -78,13 +56,13 @@ CTDL_MODULE_INIT(test)
 	if (!threading)
 	{
 		CtdlRegisterCleanupHook(CleanupTest);
-		CtdlRegisterSessionHook(NewRoomTest, EVT_NEWROOM);
-		CtdlRegisterSessionHook(SessionStartTest, EVT_START);
-		CtdlRegisterSessionHook(SessionStopTest, EVT_STOP);
-		CtdlRegisterSessionHook(LoginTest, EVT_LOGIN);
+		CtdlRegisterSessionHook(NewRoomTest, EVT_NEWROOM, 1);
+		CtdlRegisterSessionHook(SessionStartTest, EVT_START, 1);
+		CtdlRegisterSessionHook(SessionStopTest, EVT_STOP, 1);
+		CtdlRegisterSessionHook(LoginTest, EVT_LOGIN, 1);
 	}
 #endif
 
-   /* return our Subversion id for the Log */
-   return "$Id$";
+/* return our module name for the log */
+return "test";
 }