X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserv_extensions.c;h=9100daea3509c914b2df4a8670de418b146b9bda;hb=9f3bb5c0737c12bd1765425ad8676d5cde03f52f;hp=d2890ebaeedbd5094f0e06d99bf4bedd4dda892f;hpb=a4b7b2c87bf09fe0c558358eb784bf21c26aca39;p=citadel.git

diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c
index d2890ebae..9100daea3 100644
--- a/citadel/serv_extensions.c
+++ b/citadel/serv_extensions.c
@@ -46,12 +46,19 @@
 #include "snprintf.h"
 #endif
 
+int DebugModules = 0;
  
 /*
  * Structure defentitions for hook tables
  */
 
-
+typedef struct __LogDebugEntry {
+	CtdlDbgFunction F;
+	const char *Name;
+	long Len;
+	const int *LogP;
+} LogDebugEntry;
+HashList *LogDebugEntryTable = NULL;
 
 typedef struct LogFunctionHook LogFunctionHook;
 struct LogFunctionHook {
@@ -61,7 +68,6 @@ struct LogFunctionHook {
 };
 extern LogFunctionHook *LogHookTable;
 
-
 typedef struct FixedOutputHook FixedOutputHook;
 struct FixedOutputHook {
 	FixedOutputHook *next;
@@ -271,8 +277,8 @@ void LogPrintMessages(long err)
 	StrBufAppendBufPlain(Message, HKEY("\n\n"), 0);
 	StrBufAppendBufPlain(Message, CKEY(ErrGeneral[3]), 0);
 
-	syslog(LOG_EMERG, "%s", ChrPtr(Message));
-	syslog(LOG_EMERG, "%s", ErrSubject);
+	MOD_syslog(LOG_EMERG, "%s", ChrPtr(Message));
+	MOD_syslog(LOG_EMERG, "%s", ErrSubject);
 	quickie_message("Citadel", NULL, NULL, AIDEROOM, ChrPtr(Message), FMT_FIXED, ErrSubject);
 
 	FreeStrBuf(&Message);
@@ -329,6 +335,117 @@ long FourHash(const char *key, long length)
 	return ret;
 }
 
+void CtdlRegisterDebugFlagHook(const char *Name, long Len, CtdlDbgFunction F, const int *LogP)
+{
+	LogDebugEntry *E;
+	if (LogDebugEntryTable == NULL)
+		LogDebugEntryTable = NewHash(1, NULL);
+	E = (LogDebugEntry*) malloc(sizeof(LogDebugEntry));
+	E->F = F;
+	E->Name = Name;
+	E->Len = Len;
+	E->LogP = LogP;
+	Put(LogDebugEntryTable, Name, Len, E, NULL);
+	
+}
+void CtdlSetDebugLogFacilities(const char **Str, long n)
+{
+	StrBuf *Token = NULL;
+	StrBuf *Buf = NULL;
+	const char *ch;
+	int i;
+	int DoAll = 0;
+	void *vptr;
+
+	for (i=0; i < n; i++){
+		if ((Str[i] != NULL) && !IsEmptyStr(Str[i])) {
+			if (strcmp(Str[i], "all") == 0) {
+				DoAll = 1;
+				continue;
+			}
+			Buf = NewStrBufPlain(Str[i], -1);
+			ch = NULL;
+			if (Token == NULL)
+				Token = NewStrBufPlain(NULL, StrLength(Buf));
+			while ((ch != StrBufNOTNULL) &&
+			       StrBufExtract_NextToken(Token, Buf, &ch, ',')) {
+				if (GetHash(LogDebugEntryTable, SKEY(Token), &vptr) && 
+				    (vptr != NULL))
+				{
+					LogDebugEntry *E = (LogDebugEntry*)vptr;
+					E->F(1);
+				}
+			}
+		}
+		FreeStrBuf(&Buf);
+	}
+	FreeStrBuf(&Token);
+	if (DoAll) {
+		long HKLen;
+		const char *ch;
+		HashPos *Pos;
+
+		Pos = GetNewHashPos(LogDebugEntryTable, 0);
+		while (GetNextHashPos(LogDebugEntryTable, Pos, &HKLen, &ch, &vptr)) {
+			LogDebugEntry *E = (LogDebugEntry*)vptr;
+			E->F(1);
+		}
+
+		DeleteHashPos(&Pos);
+	}
+}
+void cmd_log_get(char *argbuf)
+{
+	long HKLen;
+	const char *ch;
+	HashPos *Pos;
+	void *vptr;
+
+	if (CtdlAccessCheck(ac_aide)) return;
+
+	cprintf("%d Log modules enabled:\n", LISTING_FOLLOWS);
+
+	Pos = GetNewHashPos(LogDebugEntryTable, 0);
+
+	while (GetNextHashPos(LogDebugEntryTable, Pos, &HKLen, &ch, &vptr)) {
+		LogDebugEntry *E = (LogDebugEntry*)vptr;
+		cprintf("%s: %d\n", ch, *E->LogP);
+	}
+	
+	DeleteHashPos(&Pos);
+	cprintf("000\n");
+}
+void cmd_log_set(char *argbuf)
+{
+	void *vptr;
+	int lset;
+	int wlen;
+	char which[SIZ] = "";
+
+	if (CtdlAccessCheck(ac_aide)) return;
+
+	wlen = extract_token(which, argbuf, 0, '|', sizeof(which));
+	if (wlen < 0) wlen = 0;
+	lset = extract_int(argbuf, 1);
+	if (lset != 0) lset = 1;
+	if (GetHash(LogDebugEntryTable, which, wlen, &vptr) && 
+	    (vptr != NULL))
+	{
+		LogDebugEntry *E = (LogDebugEntry*)vptr;
+		E->F(lset);
+		cprintf("%d %s|%d\n", CIT_OK, which, lset);
+	}
+	else {
+		cprintf("%d Log setting %s not known\n", 
+			ERROR, which);
+	}
+}
+void CtdlDestroyDebugTable(void)
+{
+
+	DeleteHash(&LogDebugEntryTable);
+}
+
 void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc)
 {
 	ProtoFunctionHook *p;
@@ -349,7 +466,7 @@ void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc)
 	p->desc = desc;
 
 	Put(ProtoHookList, cmd, 4, p, NULL);
-	syslog(LOG_INFO, "Registered server command %s (%s)\n", cmd, desc);
+	MOD_syslog(LOG_DEBUG, "Registered server command %s (%s)\n", cmd, desc);
 }
 
 void CtdlDestroyProtoHooks(void)
@@ -370,7 +487,7 @@ void CtdlRegisterCleanupHook(void (*fcn_ptr) (void))
 	newfcn->h_function_pointer = fcn_ptr;
 	CleanupHookTable = newfcn;
 
-	syslog(LOG_INFO, "Registered a new cleanup function\n");
+	MODM_syslog(LOG_DEBUG, "Registered a new cleanup function\n");
 }
 
 
@@ -382,7 +499,7 @@ void CtdlUnregisterCleanupHook(void (*fcn_ptr) (void))
 		/* This will also remove duplicates if any */
 		while (cur != NULL &&
 				fcn_ptr == cur->h_function_pointer) {
-			syslog(LOG_INFO, "Unregistered cleanup function\n");
+			MODM_syslog(LOG_DEBUG, "Unregistered cleanup function\n");
 			p = cur->next;
 			if (cur == CleanupHookTable) {
 				CleanupHookTable = p;
@@ -401,7 +518,7 @@ void CtdlDestroyCleanupHooks(void)
 	cur = CleanupHookTable;
 	while (cur != NULL)
 	{
-		syslog(LOG_INFO, "Destroyed cleanup function\n");
+		MODM_syslog(LOG_DEBUG, "Destroyed cleanup function\n");
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -420,7 +537,7 @@ void CtdlRegisterEVCleanupHook(void (*fcn_ptr) (void))
 	newfcn->h_function_pointer = fcn_ptr;
 	EVCleanupHookTable = newfcn;
 
-	syslog(LOG_INFO, "Registered a new cleanup function\n");
+	MODM_syslog(LOG_DEBUG, "Registered a new cleanup function\n");
 }
 
 
@@ -432,7 +549,7 @@ void CtdlUnregisterEVCleanupHook(void (*fcn_ptr) (void))
 		/* This will also remove duplicates if any */
 		while (cur != NULL &&
 				fcn_ptr == cur->h_function_pointer) {
-			syslog(LOG_INFO, "Unregistered cleanup function\n");
+			MODM_syslog(LOG_DEBUG, "Unregistered cleanup function\n");
 			p = cur->next;
 			if (cur == EVCleanupHookTable) {
 				EVCleanupHookTable = p;
@@ -451,7 +568,7 @@ void CtdlDestroyEVCleanupHooks(void)
 	cur = EVCleanupHookTable;
 	while (cur != NULL)
 	{
-		syslog(LOG_INFO, "Destroyed cleanup function\n");
+		MODM_syslog(LOG_DEBUG, "Destroyed cleanup function\n");
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -472,8 +589,8 @@ void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType)
 	newfcn->eventtype = EventType;
 	SessionHookTable = newfcn;
 
-	syslog(LOG_INFO, "Registered a new session function (type %d)\n",
-		EventType);
+	MOD_syslog(LOG_DEBUG, "Registered a new session function (type %d)\n",
+		   EventType);
 }
 
 
@@ -486,8 +603,8 @@ void CtdlUnregisterSessionHook(void (*fcn_ptr) (void), int EventType)
 		while (cur != NULL &&
 				fcn_ptr == cur->h_function_pointer &&
 				EventType == cur->eventtype) {
-			syslog(LOG_INFO, "Unregistered session function (type %d)\n",
-					EventType);
+			MOD_syslog(LOG_DEBUG, "Unregistered session function (type %d)\n",
+				   EventType);
 			p = cur->next;
 			if (cur == SessionHookTable) {
 				SessionHookTable = p;
@@ -505,7 +622,7 @@ void CtdlDestroySessionHooks(void)
 	cur = SessionHookTable;
 	while (cur != NULL)
 	{
-		syslog(LOG_INFO, "Destroyed session function\n");
+		MODM_syslog(LOG_DEBUG, "Destroyed session function\n");
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -526,8 +643,8 @@ void CtdlRegisterUserHook(void (*fcn_ptr) (ctdluser *), int EventType)
 	newfcn->eventtype = EventType;
 	UserHookTable = newfcn;
 
-	syslog(LOG_INFO, "Registered a new user function (type %d)\n",
-		EventType);
+	MOD_syslog(LOG_DEBUG, "Registered a new user function (type %d)\n",
+		   EventType);
 }
 
 
@@ -540,8 +657,8 @@ void CtdlUnregisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType)
 		while (cur != NULL &&
 				fcn_ptr == cur->h_function_pointer &&
 				EventType == cur->eventtype) {
-			syslog(LOG_INFO, "Unregistered user function (type %d)\n",
-					EventType);
+			MOD_syslog(LOG_DEBUG, "Unregistered user function (type %d)\n",
+				   EventType);
 			p = cur->next;
 			if (cur == UserHookTable) {
 				UserHookTable = p;
@@ -559,7 +676,7 @@ void CtdlDestroyUserHooks(void)
 	cur = UserHookTable;
 	while (cur != NULL)
 	{
-		syslog(LOG_INFO, "Destroyed user function \n");
+		MODM_syslog(LOG_DEBUG, "Destroyed user function \n");
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -581,8 +698,8 @@ void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *),
 	newfcn->eventtype = EventType;
 	MessageHookTable = newfcn;
 
-	syslog(LOG_INFO, "Registered a new message function (type %d)\n",
-		EventType);
+	MOD_syslog(LOG_DEBUG, "Registered a new message function (type %d)\n",
+		   EventType);
 }
 
 
@@ -596,8 +713,8 @@ void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *),
 		while (cur != NULL &&
 				handler == cur->h_function_pointer &&
 				EventType == cur->eventtype) {
-			syslog(LOG_INFO, "Unregistered message function (type %d)\n",
-					EventType);
+			MOD_syslog(LOG_DEBUG, "Unregistered message function (type %d)\n",
+				   EventType);
 			p = cur->next;
 			if (cur == MessageHookTable) {
 				MessageHookTable = p;
@@ -615,7 +732,7 @@ void CtdlDestroyMessageHook(void)
 	cur = MessageHookTable; 
 	while (cur != NULL)
 	{
-		syslog(LOG_INFO, "Destroyed message function (type %d)\n", cur->eventtype);
+		MOD_syslog(LOG_DEBUG, "Destroyed message function (type %d)\n", cur->eventtype);
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -634,7 +751,7 @@ void CtdlRegisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
 	newfcn->fcn_ptr = fcn_ptr;
 	RoomHookTable = newfcn;
 
-	syslog(LOG_INFO, "Registered a new room function\n");
+	MODM_syslog(LOG_DEBUG, "Registered a new room function\n");
 }
 
 
@@ -644,7 +761,7 @@ void CtdlUnregisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
 
 	for (cur = RoomHookTable; cur != NULL; cur = cur->next) {
 		while (cur != NULL && fcn_ptr == cur->fcn_ptr) {
-			syslog(LOG_INFO, "Unregistered room function\n");
+			MODM_syslog(LOG_DEBUG, "Unregistered room function\n");
 			p = cur->next;
 			if (cur == RoomHookTable) {
 				RoomHookTable = p;
@@ -663,7 +780,7 @@ void CtdlDestroyRoomHooks(void)
 	cur = RoomHookTable;
 	while (cur != NULL)
 	{
-		syslog(LOG_INFO, "Destroyed room function\n");
+		MODM_syslog(LOG_DEBUG, "Destroyed room function\n");
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -681,7 +798,7 @@ void CtdlRegisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
 	newfcn->h_function_pointer = handler;
 	NetprocHookTable = newfcn;
 
-	syslog(LOG_INFO, "Registered a new netproc function\n");
+	MODM_syslog(LOG_DEBUG, "Registered a new netproc function\n");
 }
 
 
@@ -693,7 +810,7 @@ void CtdlUnregisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
 		/* This will also remove duplicates if any */
 		while (cur != NULL &&
 				handler == cur->h_function_pointer ) {
-			syslog(LOG_INFO, "Unregistered netproc function\n");
+			MODM_syslog(LOG_DEBUG, "Unregistered netproc function\n");
 			p = cur->next;
 			if (cur == NetprocHookTable) {
 				NetprocHookTable = p;
@@ -711,7 +828,7 @@ void CtdlDestroyNetprocHooks(void)
 	cur = NetprocHookTable;
 	while (cur != NULL)
 	{
-		syslog(LOG_INFO, "Destroyed netproc function\n");
+		MODM_syslog(LOG_DEBUG, "Destroyed netproc function\n");
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -730,7 +847,7 @@ void CtdlRegisterDeleteHook(void (*handler)(char *, long) )
 	newfcn->h_function_pointer = handler;
 	DeleteHookTable = newfcn;
 
-	syslog(LOG_INFO, "Registered a new delete function\n");
+	MODM_syslog(LOG_DEBUG, "Registered a new delete function\n");
 }
 
 
@@ -742,7 +859,7 @@ void CtdlUnregisterDeleteHook(void (*handler)(char *, long) )
 		/* This will also remove duplicates if any */
 		while (cur != NULL &&
 				handler == cur->h_function_pointer ) {
-			syslog(LOG_INFO, "Unregistered delete function\n");
+			MODM_syslog(LOG_DEBUG, "Unregistered delete function\n");
 			p = cur->next;
 			if (cur == DeleteHookTable) {
 				DeleteHookTable = p;
@@ -759,7 +876,7 @@ void CtdlDestroyDeleteHooks(void)
 	cur = DeleteHookTable;
 	while (cur != NULL)
 	{
-		syslog(LOG_INFO, "Destroyed delete function\n");
+		MODM_syslog(LOG_DEBUG, "Destroyed delete function\n");
 		p = cur->next;
 		free(cur);
 		cur = p;		
@@ -781,7 +898,7 @@ void CtdlRegisterFixedOutputHook(char *content_type, void (*handler)(char *, int
 	safestrncpy(newfcn->content_type, content_type, sizeof newfcn->content_type);
 	FixedOutputTable = newfcn;
 
-	syslog(LOG_INFO, "Registered a new fixed output function for %s\n", newfcn->content_type);
+	MOD_syslog(LOG_DEBUG, "Registered a new fixed output function for %s\n", newfcn->content_type);
 }
 
 
@@ -792,7 +909,7 @@ void CtdlUnregisterFixedOutputHook(char *content_type)
 	for (cur = FixedOutputTable; cur != NULL; cur = cur->next) {
 		/* This will also remove duplicates if any */
 		while (cur != NULL && (!strcasecmp(content_type, cur->content_type))) {
-			syslog(LOG_INFO, "Unregistered fixed output function for %s\n", content_type);
+			MOD_syslog(LOG_DEBUG, "Unregistered fixed output function for %s\n", content_type);
 			p = cur->next;
 			if (cur == FixedOutputTable) {
 				FixedOutputTable = p;
@@ -810,7 +927,7 @@ void CtdlDestroyFixedOutputHooks(void)
 	cur = FixedOutputTable; 
 	while (cur != NULL)
 	{
-		syslog(LOG_INFO, "Destroyed fixed output function for %s\n", cur->content_type);
+		MOD_syslog(LOG_DEBUG, "Destroyed fixed output function for %s\n", cur->content_type);
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -847,7 +964,7 @@ void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int o
 	newfcn->order = order;
 	newfcn->h_function_pointer = fcn_ptr;
 	XmsgHookTable = newfcn;
-	syslog(LOG_INFO, "Registered a new x-msg function (priority %d)\n", order);
+	MOD_syslog(LOG_DEBUG, "Registered a new x-msg function (priority %d)\n", order);
 }
 
 
@@ -860,8 +977,8 @@ void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int
 		while (cur != NULL &&
 				fcn_ptr == cur->h_function_pointer &&
 				order == cur->order) {
-			syslog(LOG_INFO, "Unregistered x-msg function "
-					"(priority %d)\n", order);
+			MOD_syslog(LOG_DEBUG, "Unregistered x-msg function "
+				   "(priority %d)\n", order);
 			p = cur->next;
 			if (cur == XmsgHookTable) {
 				XmsgHookTable = p;
@@ -879,7 +996,7 @@ void CtdlDestroyXmsgHooks(void)
 	cur = XmsgHookTable;
 	while (cur != NULL)
 	{
-		syslog(LOG_INFO, "Destroyed x-msg function "
+		MOD_syslog(LOG_DEBUG, "Destroyed x-msg function "
 			"(priority %d)\n", cur->order);
 		p = cur->next;
 			
@@ -918,7 +1035,7 @@ void CtdlRegisterServiceHook(int tcp_port,
 		snprintf(message, SIZ, "Unix domain socket '%s': ", sockpath);
 	}
 	else if (tcp_port <= 0) {	/* port -1 to disable */
-		syslog(LOG_INFO, "Service %s has been manually disabled, skipping\n", ServiceName);
+		MOD_syslog(LOG_INFO, "Service %s has been manually disabled, skipping\n", ServiceName);
 		free (message);
 		free(newfcn);
 		return;
@@ -935,12 +1052,12 @@ void CtdlRegisterServiceHook(int tcp_port,
 	if (newfcn->msock > 0) {
 		ServiceHookTable = newfcn;
 		strcat(message, "registered.");
-		syslog(LOG_INFO, "%s\n", message);
+		MOD_syslog(LOG_INFO, "%s\n", message);
 	}
 	else {
 		AddPortError(message, error);
 		strcat(message, "FAILED.");
-		syslog(LOG_CRIT, "%s\n", message);
+		MOD_syslog(LOG_CRIT, "%s\n", message);
 		free(newfcn);
 	}
 	free(message);
@@ -967,13 +1084,13 @@ void CtdlUnregisterServiceHook(int tcp_port, char *sockpath,
 				tcp_port == cur->tcp_port) {
 			close(cur->msock);
 			if (sockpath) {
-				syslog(LOG_INFO, "Closed UNIX domain socket %s\n",
-						sockpath);
+				MOD_syslog(LOG_INFO, "Closed UNIX domain socket %s\n",
+					   sockpath);
 				unlink(sockpath);
 			} else if (tcp_port) {
-				syslog(LOG_INFO, "Closed TCP port %d\n", tcp_port);
+				MOD_syslog(LOG_INFO, "Closed TCP port %d\n", tcp_port);
 			} else {
-				syslog(LOG_INFO, "Unregistered service \"%s\"\n", cur->ServiceName);
+				MOD_syslog(LOG_INFO, "Unregistered service \"%s\"\n", cur->ServiceName);
 			}
 			p = cur->next;
 			if (cur == ServiceHookTable) {
@@ -999,13 +1116,13 @@ void CtdlShutdownServiceHooks(void)
 			close(cur->msock);
 			cur->msock = -1;
 			if (cur->sockpath != NULL){
-				syslog(LOG_INFO, "[%s] Closed UNIX domain socket %s\n",
-					      cur->ServiceName,
-					      cur->sockpath);
+				MOD_syslog(LOG_INFO, "[%s] Closed UNIX domain socket %s\n",
+					   cur->ServiceName,
+					   cur->sockpath);
 				unlink(cur->sockpath);
 			} else {
-				syslog(LOG_INFO, "[%s] closing service\n", 
-					      cur->ServiceName);
+				MOD_syslog(LOG_INFO, "[%s] closing service\n", 
+					   cur->ServiceName);
 			}
 		}
 		cur = cur->next;
@@ -1021,13 +1138,13 @@ void CtdlDestroyServiceHook(void)
 	{
 		close(cur->msock);
 		if (cur->sockpath) {
-			syslog(LOG_INFO, "Closed UNIX domain socket %s\n",
-				cur->sockpath);
+			MOD_syslog(LOG_INFO, "Closed UNIX domain socket %s\n",
+				   cur->sockpath);
 			unlink(cur->sockpath);
 		} else if (cur->tcp_port) {
-			syslog(LOG_INFO, "Closed TCP port %d\n", cur->tcp_port);
+			MOD_syslog(LOG_INFO, "Closed TCP port %d\n", cur->tcp_port);
 		} else {
-			syslog(LOG_INFO, "Destroyed service \"%s\"\n", cur->ServiceName);
+			MOD_syslog(LOG_INFO, "Destroyed service \"%s\"\n", cur->ServiceName);
 		}
 		p = cur->next;
 		free(cur);
@@ -1051,7 +1168,7 @@ void CtdlRegisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), c
 	newfcn->fcn_ptr = fcn_ptr;
 	SearchFunctionHookTable = newfcn;
 
-	syslog(LOG_INFO, "Registered a new search function (%s)\n", name);
+	MOD_syslog(LOG_DEBUG, "Registered a new search function (%s)\n", name);
 }
 
 void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), char *name)
@@ -1060,7 +1177,7 @@ void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *),
 	
 	for (cur = SearchFunctionHookTable; cur != NULL; cur = cur->next) {
 		while (fcn_ptr && (cur->fcn_ptr == fcn_ptr) && name && !strcmp(name, cur->name)) {
-			syslog(LOG_INFO, "Unregistered search function(%s)\n", name);
+			MOD_syslog(LOG_DEBUG, "Unregistered search function(%s)\n", name);
 			p = cur->next;
 			if (cur == SearchFunctionHookTable) {
 				SearchFunctionHookTable = p;
@@ -1130,10 +1247,10 @@ int PerformMessageHooks(struct CtdlMessage *msg, int EventType)
 
 	/* Other code may elect to protect this message from server-side
 	 * handlers; if this is the case, don't do anything.
-	syslog(LOG_DEBUG, "** Event type is %d, flags are %d\n", EventType, msg->cm_flags);
+	MOD_syslog(LOG_DEBUG, "** Event type is %d, flags are %d\n", EventType, msg->cm_flags);
 	 */
 	if (msg->cm_flags & CM_SKIP_HOOKS) {
-		syslog(LOG_DEBUG, "Skipping hooks\n");
+		MODM_syslog(LOG_DEBUG, "Skipping hooks\n");
 		return(0);
 	}
 
@@ -1158,7 +1275,7 @@ int PerformRoomHooks(struct ctdlroom *target_room)
 	RoomFunctionHook *fcn;
 	int total_retval = 0;
 
-	syslog(LOG_DEBUG, "Performing room hooks for <%s>\n", target_room->QRname);
+	MOD_syslog(LOG_DEBUG, "Performing room hooks for <%s>\n", target_room->QRname);
 
 	for (fcn = RoomHookTable; fcn != NULL; fcn = fcn->next) {
 		total_retval = total_retval + (*fcn->fcn_ptr) (target_room);
@@ -1234,3 +1351,18 @@ void CtdlModuleStartCryptoMsgs(char *ok_response, char *nosup_response, char *er
 	CtdlStartTLS (ok_response, nosup_response, error_response);
 #endif
 }
+
+void DebugModulesEnable(const int n)
+{
+	DebugModules = n;
+}
+CTDL_MODULE_INIT(modules)
+{
+	if (!threading) {
+		CtdlRegisterDebugFlagHook(HKEY("modules"), DebugModulesEnable, &DebugModules);
+
+		CtdlRegisterProtoHook(cmd_log_get, "LOGP", "Print Log-parameters");
+		CtdlRegisterProtoHook(cmd_log_set, "LOGS", "Set Log-parameters");
+	}
+	return "modules";
+}