Changeset 898:c2ecce3fb928 in freeDiameter

Timestamp:

Dec 4, 2012, 5:27:19 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Add a NONE option for fd_msg_log to disable the trace

Files:

• include/freeDiameter/libfdproto.h (modified) (1 diff)
• libfdproto/msg_log.c (modified) (4 diffs)

include/freeDiameter/libfdproto.h

@@ -2247 +2247 @@
 /* configure the msg_log facility */
 enum fd_msg_log_method {
-        FD_MSG_LOGTO_DEBUGONLY = 0, /* Simply log the message with other debug information, at the INFO level. This is default */
+        FD_MSG_LOGTO_NONE = 0, /* The message is not dumped. This is the default. */
+        FD_MSG_LOGTO_DEBUGONLY, /* Simply log the message with other debug information, at the INFO level. */
         FD_MSG_LOGTO_FILE,    /* Messages are dumped in a single file, defined in arg */
         FD_MSG_LOGTO_DIR    /* Messages are dumped in different files within one directory defined in arg. */

libfdproto/msg_log.c

@@ -64 +64 @@
         TRACE_ENTRY("%d %d %p", cause, method, arg);
         CHECK_PARAMS( (cause >= 0) && (cause <= FD_MSG_LOG_MAX) );
-        CHECK_PARAMS( (method >= FD_MSG_LOGTO_DEBUGONLY) && (method <= FD_MSG_LOGTO_DIR) );
-        CHECK_PARAMS( (method == FD_MSG_LOGTO_DEBUGONLY) || (arg != NULL) );
+        CHECK_PARAMS( (method >= FD_MSG_LOGTO_NONE) && (method <= FD_MSG_LOGTO_DIR) );
+        CHECK_PARAMS( (method == FD_MSG_LOGTO_NONE) || (method == FD_MSG_LOGTO_DEBUGONLY) || (arg != NULL) );
         
         /* Lock the configuration */
@@ -82 +82 @@
                                 (cause == FD_MSG_LOG_RECEIVED) ? "RECEIVED" :
                                         (cause == FD_MSG_LOG_SENT) ? "SENT" :
+                                        (cause == FD_MSG_LOG_NODELIVER) ? "NODELIVER" :
+                                        (cause == FD_MSG_LOG_TIMING) ? "TIMING" :
                                                 "???",
-                        (method == FD_MSG_LOGTO_FILE) ? "file" :
+                        (method == FD_MSG_LOGTO_NONE) ? "none" :
+                                (method == FD_MSG_LOGTO_DEBUGONLY) ? "debug" :
+                                (method == FD_MSG_LOGTO_FILE) ? "file" :
                                 (method == FD_MSG_LOGTO_DIR) ? "directory" :
                                         "???",
@@ -130 +134 @@
         CHECK_POSIX_DO( pthread_mutex_unlock(&ml_conf.lock), );
         
-        /* Do not log if the level is not at least INFO */
-        if ((meth == FD_MSG_LOGTO_DEBUGONLY) && (fd_g_debug_lvl < INFO)) {
+        /* Return now when loging is not requested */
+        if ((meth == FD_MSG_LOGTO_NONE) 
+         || ((meth == FD_MSG_LOGTO_DEBUGONLY) && (fd_g_debug_lvl < INFO))) {
                 return;
         }
@@ -187 +192 @@
         /* And finally close the stream if needed */
         switch (meth) {
-                case FD_MSG_LOGTO_DEBUGONLY:
-                        break;
-                        
                 case FD_MSG_LOGTO_FILE:
                         TODO("close?");