LOGGING: make module infrastructure logging configurable

[citadel.git] / citadel / serv_extensions.c

diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c
index 04c34704b7de0bc15a0dc69d32fcbf89114463a6..9100daea3509c914b2df4a8670de418b146b9bda 100644 (file)
--- a/citadel/serv_extensions.c
+++ b/citadel/serv_extensions.c
@@ -46,6 +46,7 @@
 #include "snprintf.h"
 #endif
 
+int DebugModules = 0;
  
 /*
  * Structure defentitions for hook tables
@@ -276,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);
@@ -465,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)
@@ -486,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");
 }
 
 
@@ -498,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;
@@ -517,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;
@@ -536,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");
 }
 
 
@@ -548,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;
@@ -567,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;
@@ -588,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);
 }
 
 
@@ -602,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;
@@ -621,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;
@@ -642,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);
 }
 
 
@@ -656,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;
@@ -675,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;
@@ -697,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);
 }
 
 
@@ -712,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;
@@ -731,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;
@@ -750,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");
 }
 
 
@@ -760,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;
@@ -779,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;
@@ -797,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");
 }
 
 
@@ -809,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;
@@ -827,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;
@@ -846,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");
 }
 
 
@@ -858,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;
@@ -875,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;                
@@ -897,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);
 }
 
 
@@ -908,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;
@@ -926,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;
@@ -963,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);
 }
 
 
@@ -976,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;
@@ -995,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;
                        
@@ -1034,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;
@@ -1051,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);
@@ -1083,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) {
@@ -1115,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;
@@ -1137,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);
@@ -1167,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)
@@ -1176,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;
@@ -1246,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);
        }
 
@@ -1274,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);
@@ -1351,10 +1352,15 @@ void CtdlModuleStartCryptoMsgs(char *ok_response, char *nosup_response, char *er
 #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");
        }