Changeset 1407:d4a4ab5239c7 in freeDiameter

Timestamp:

Feb 18, 2020, 3:01:07 PM (4 years ago)

Author:

Luke Mewburn <luke@mewburn.net>

Branch:

default

Phase:

public

Message:

add log level FD_LOG_INFO

Add log level FD_LOG_INFO, below FD_LOG_NOTICE and above FD_LOG_DEBUG.

Files:

• freeDiameterd/main.c (modified) (1 diff)
• include/freeDiameter/libfdproto.h (modified) (5 diffs)
• libfdproto/log.c (modified) (1 diff)

freeDiameterd/main.c

@@ -69 +69 @@
 
         switch (loglevel) {
+        case FD_LOG_INFO:
+                level = LOG_INFO;
+                break;
         case FD_LOG_NOTICE:
                 level = LOG_NOTICE;

include/freeDiameter/libfdproto.h

@@ -271 +271 @@
 #define FD_LOG_ANNOYING  0  /* very verbose loops and such "overkill" traces. Only active when the framework is compiled in DEBUG mode. */
 #define FD_LOG_DEBUG     1  /* Get a detailed sense of what is going on in the framework. Use this level for normal debug */
+#define FD_LOG_INFO      2  /* Informational execution states */
 #define FD_LOG_NOTICE    3  /* Normal execution states worth noting */
 #define FD_LOG_ERROR     5  /* Recoverable or expected error conditions */
@@ -330 +331 @@
 #define LOG_D(format,args... ) \
                 LOG(FD_LOG_DEBUG, format, ##args)
+
+/* Report an info message */
+#define LOG_I(format,args... ) \
+                LOG(FD_LOG_INFO, format,##args)
 
 /* Report a normal message that is useful for normal admin monitoring */
@@ -517 +522 @@
                 if ((__l__ = TRACE_BOOL(oldlevel))) {                                   \
                         if      (oldlevel <= NONE) { LOG_E(format,##args); }            \
-                        else if (oldlevel <= INFO) { LOG_N(format,##args); }            \
+                        else if (oldlevel <= INFO) { LOG_I(format,##args); }            \
                         else if (__l__ == 2)       { LOG_N(format,##args); }            \
                         else if (oldlevel <= FULL) { LOG_D(format,##args); }            \
@@ -596 +601 @@
 #ifdef STRIP_DEBUG_CODE
 #undef LOG_D
+#undef LOG_I
 #undef LOG_N
 #undef LOG_E
@@ -602 +608 @@
 
 #define LOG_D(format,args... ) /* noop */
+#define LOG_I(format,args...) fd_log(FD_LOG_INFO, format, ## args)
 #define LOG_N(format,args...) fd_log(FD_LOG_NOTICE, format, ## args)
 #define LOG_E(format,args...) fd_log(FD_LOG_ERROR, format, ## args)

libfdproto/log.c

@@ -113 +113 @@
             case FD_LOG_ANNOYING:  printf("%s   A   ", (use_colors == 1) ? "\e[0;37m" : ""); break;
             case FD_LOG_DEBUG:     printf("%s DBG   ", (use_colors == 1) ? "\e[0;37m" : ""); break;
+            case FD_LOG_INFO:      printf("%sINFO   ", (use_colors == 1) ? "\e[1;37m" : ""); break;
             case FD_LOG_NOTICE:    printf("%sNOTI   ", (use_colors == 1) ? "\e[1;37m" : ""); break;
             case FD_LOG_ERROR:     printf("%sERROR  ", (use_colors == 1) ? "\e[0;31m" : ""); break;