Merge master

[netatalk.git] / libatalk / util / logger.c

diff --git a/libatalk/util/logger.c b/libatalk/util/logger.c
index 1b3e9a2fa13af3ee2c3577d461133405108aa5e0..241b22df092285aff506350c137d6c2122df9385 100644 (file)
--- a/libatalk/util/logger.c
+++ b/libatalk/util/logger.c
@@ -27,10 +27,9 @@ Netatalk 2001 (c)
 #include <time.h>
 #include <ctype.h>
 #include <errno.h>
+#include <stdbool.h>
 
-#include <atalk/boolean.h>
 #include <atalk/util.h>
-
 #include <atalk/logger.h>
 
 #define OPEN_LOGS_AS_UID 0
@@ -92,8 +91,10 @@ UAM_MODULE_EXPORT logtype_conf_t type_configs[logtype_end_of_list_marker] = {
 };
 
 /* We use this in order to track the last n log messages in order to prevent flooding */
-#define LOG_FLOODING_MAXCOUNT 10 /* this controls after how many consecutive messages we force a 
-                                    "repeated x times" message */
+#define LOG_FLOODING_MINCOUNT 5 /* this controls after how many consecutive messages must be detected
+                                   before we start to hide them */
+#define LOG_FLOODING_MAXCOUNT 1000 /* this controls after how many consecutive messages we force a 
+                                      "repeated x times" message */
 #define LOG_FLOODING_ARRAY_SIZE 3 /* this contols how many messages in flow we track */
 struct log_flood_entry {
     int count;
@@ -435,7 +436,7 @@ void syslog_setup(int loglevel, enum logtypes logtype, int display_options, int
 
     log_config.inited = 1;
 
-    LOG(log_note, logtype_logger, "Set syslog logging to level: %s",
+    LOG(log_info, logtype_logger, "Set syslog logging to level: %s",
         arr_loglevel_strings[loglevel]);
 }
 
@@ -537,8 +538,11 @@ void make_log_entry(enum loglevels loglevel, enum logtypes logtype,
         temp_buffer[len+1] = 0;
     }
 
+    if (type_configs[logtype].level >= log_debug)
+        goto log; /* bypass flooding checks */
+
     /* Prevent flooding: hash the message and check if we got the same one recently */
-    int hash = hash_message(temp_buffer);
+    int hash = hash_message(temp_buffer) + log_src_linenumber;
 
     /* Search for the same message by hash */
     for (int i = log_flood_entries - 1; i >= 0; i--) {
@@ -552,14 +556,9 @@ void make_log_entry(enum loglevels loglevel, enum logtypes logtype,
                 /* yes, log it and remove from array */
 
                 /* reusing log_details_buffer */
-                sprintf(log_details_buffer, "message repeated %i times: ", log_flood_array[i].count);
-                iov[0].iov_base = log_details_buffer;
-                iov[0].iov_len = strlen(log_details_buffer);
-                iov[1].iov_base = temp_buffer;
-                iov[1].iov_len = strlen(temp_buffer);
-
-                /* Write "message repeated x times: ..." to log */
-                writev( fd, iov, 2);
+                sprintf(log_details_buffer, "message repeated %i times\n",
+                        LOG_FLOODING_MAXCOUNT - 1);
+                write(fd, log_details_buffer, strlen(log_details_buffer));
 
                 if ((i + 1) == LOG_FLOODING_ARRAY_SIZE) {
                     /* last array element, just decrement count */
@@ -571,6 +570,11 @@ void make_log_entry(enum loglevels loglevel, enum logtypes logtype,
                     log_flood_array[j-1] = log_flood_array[j];
                 log_flood_entries--;
             }
+
+            if (log_flood_array[i].count < LOG_FLOODING_MINCOUNT)
+                /* log it */
+                goto log;
+            /* discard it */
             goto exit;
         } /* if */
     }  /* for */
@@ -578,26 +582,22 @@ void make_log_entry(enum loglevels loglevel, enum logtypes logtype,
     /* No matching message found, add this message to array*/
     if (log_flood_entries == LOG_FLOODING_ARRAY_SIZE) {
         /* array is full, discard oldest entry printing "message repeated..." if count > 1 */
-        if (log_flood_array[0].count > 1) {
-                /* reusing log_details_buffer */
-                sprintf(log_details_buffer, "message repeated %i times: ", log_flood_array[0].count);
-                iov[0].iov_base = log_details_buffer;
-                iov[0].iov_len = strlen(log_details_buffer);
-                iov[1].iov_base = temp_buffer;
-                iov[1].iov_len = strlen(temp_buffer);
-
-                /* Write "message repeated x times: ..." to log */
-                writev( fd, iov, 2);
+        if (log_flood_array[0].count >= LOG_FLOODING_MINCOUNT) {
+            /* reusing log_details_buffer */
+            sprintf(log_details_buffer, "message repeated %i times\n",
+                    log_flood_array[0].count - LOG_FLOODING_MINCOUNT + 1);
+            write(fd, log_details_buffer, strlen(log_details_buffer));
         }
         for (int i = 1; i < LOG_FLOODING_ARRAY_SIZE; i++) {
             log_flood_array[i-1] = log_flood_array[i];
         }
         log_flood_entries--;
     }
-    log_flood_array[log_flood_entries-1].count = 1;
-    log_flood_array[log_flood_entries-1].hash = hash;
+    log_flood_array[log_flood_entries].count = 1;
+    log_flood_array[log_flood_entries].hash = hash;
     log_flood_entries++;
 
+log:
     if ( ! log_config.console) {
         generate_message_details(log_details_buffer, sizeof(log_details_buffer),
                                  type_configs[logtype].set ?