Changeset 899:40d5e8002b12 in freeDiameter for freeDiameterd

Timestamp:

Dec 4, 2012, 5:53:16 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Disable all logs by default, activate required logs by command-line switch. To be improved when file logging is supported

File:

• freeDiameterd/main.c (modified) (6 diffs)

freeDiameterd/main.c

@@ -49 +49 @@
 static char *conffile = NULL;
 static int gnutls_debug = 0;
+static int fd_msg_log_enabled = 0; /* all logs disabled by default, this field is a bitfield of enabled FD_MSG_LOG_* */
 
 /* gnutls debug */
@@ -85 +86 @@
                 gnutls_global_set_log_level (gnutls_debug);
                 TRACE_DEBUG(INFO, "Enabled GNUTLS debug at level %d", gnutls_debug);
+        }
+        
+        /* set messages logging */
+        if (fd_msg_log_enabled) {
+                if (fd_msg_log_enabled & (1 << FD_MSG_LOG_DROPPED)) {
+                        CHECK_FCT( fd_msg_log_config(FD_MSG_LOG_DROPPED, FD_MSG_LOGTO_DEBUGONLY, NULL) );
+                }
+                if (fd_msg_log_enabled & (1 << FD_MSG_LOG_RECEIVED)) {
+                        CHECK_FCT( fd_msg_log_config(FD_MSG_LOG_RECEIVED, FD_MSG_LOGTO_DEBUGONLY, NULL) );
+                }
+                if (fd_msg_log_enabled & (1 << FD_MSG_LOG_SENT)) {
+                        CHECK_FCT( fd_msg_log_config(FD_MSG_LOG_SENT, FD_MSG_LOGTO_DEBUGONLY, NULL) );
+                }
+                if (fd_msg_log_enabled & (1 << FD_MSG_LOG_NODELIVER)) {
+                        CHECK_FCT( fd_msg_log_config(FD_MSG_LOG_NODELIVER, FD_MSG_LOGTO_DEBUGONLY, NULL) );
+                }
+                if (fd_msg_log_enabled & (1 << FD_MSG_LOG_TIMING)) {
+                        CHECK_FCT( fd_msg_log_config(FD_MSG_LOG_TIMING, FD_MSG_LOGTO_DEBUGONLY, NULL) );
+                }
         }
                 
@@ -149 +169 @@
                 "  -V, --version          Print version and exit\n"
                 "  -c, --config=filename  Read configuration from this file instead of the \n"
-                "                           default location (" DEFAULT_CONF_PATH "/" FD_DEFAULT_CONF_FILENAME ").\n");
+                "                           default location (" DEFAULT_CONF_PATH "/" FD_DEFAULT_CONF_FILENAME ").\n"
+                "  -M, --enable_msg_log=( DROPPED | RECEIVED | SENT | NODELIVER | TIMING )\n"
+                "                         Disable logging of these messages in the output.\n");
         printf( "\nDebug:\n"
                 "  These options are mostly useful for developers\n"
@@ -175 +197 @@
                 { "dbg_file",   required_argument,      NULL, 'F' },
                 { "dbg_gnutls", required_argument,      NULL, 'g' },
+                { "enable_msg_log",     optional_argument,      NULL, 'M' },
                 { NULL,         0,                      NULL, 0 }
         };
@@ -180 +203 @@
         /* Loop on arguments */
         while (1) {
-                c = getopt_long (argc, argv, "hVc:dql:", long_options, &option_index);
+                c = getopt_long (argc, argv, "hVc:dql:M:", long_options, &option_index);
                 if (c == -1) 
                         break;  /* Exit from the loop.  */
@@ -208 +231 @@
                                 }
                                 break;
+                                
+                        case 'M':       /* disable logging of these messages */
+                                if (optarg) {
+                                        if (!strcmp(optarg, "DROPPED")) {
+                                                fd_msg_log_enabled |= 1 << FD_MSG_LOG_DROPPED;
+                                        } else
+                                        if (!strcmp(optarg, "RECEIVED")) {
+                                                fd_msg_log_enabled |= 1 << FD_MSG_LOG_RECEIVED;
+                                        } else
+                                        if (!strcmp(optarg, "SENT")) {
+                                                fd_msg_log_enabled |= 1 << FD_MSG_LOG_SENT;
+                                        } else
+                                        if (!strcmp(optarg, "NODELIVER")) {
+                                                fd_msg_log_enabled |= 1 << FD_MSG_LOG_NODELIVER;
+                                        } else
+                                        if (!strcmp(optarg, "TIMING")) {
+                                                fd_msg_log_enabled |= 1 << FD_MSG_LOG_TIMING;
+                                        } else {
+                                                main_help();
+                                                exit(0);
+                                        }
+                                } else {
+                                        fd_msg_log_enabled = -1; /* all logs enabled */
+                                }
 
                         case 'd':       /* Increase verbosity of debug messages.  */