remove inactive bus log message

this shows up very often in the log, while the information is very content is very little after x messages

Signed-off-by: Andreas Fenkart andreas.fenkart@dev.digitalstrom.org

base/log.c

@@ -31,6 +31,9 @@
#include <sys/time.h>
#include <syslog.h>
+/** log entry size excluding timestamp, incl. newline log source description */
+#define MAX_LOGLINE 256
+
static struct {
int debugLevel;
int use_syslog;
@@ -72,13 +75,13 @@ void enable_syslog(int enable)
static void my_log3000(const char *buf)
{
-    char buf2[BUFSIZ], tsbuf[30];
+    char tsbuf[30], buf2[MAX_LOGLINE + 30];
const char* sp;
struct timeval t;
gettimeofday(&t, NULL);
strftime(tsbuf, sizeof(tsbuf), "%Y-%m-%d %H:%M:%S", localtime(&t.tv_sec));
-    (void)snprintf(buf2, BUFSIZ, "[%s.%03d] ", tsbuf, (int)t.tv_usec / 1000);
+    (void)snprintf(buf2, sizeof(buf2), "[%s.%03d] ", tsbuf, (int)t.tv_usec / 1000);
for (sp = buf; *sp != '\0'; sp++) {
/* TODO buffer overlow if user can control output */
@@ -108,9 +111,25 @@ void report2(int errlevel, const char *id, const char *fmt, ...)
va_end(ap);
}
+static void do_emit(int level, const char *buf)
+{
+    pthread_mutex_lock(&reportMutex);
+
+    if (logger.use_syslog) {
+        syslog(level, "%s", buf);
+    } else {
+        my_log3000(buf);
+    }
+
+    pthread_mutex_unlock(&reportMutex);
+}
+
+static char last_msg[MAX_LOGLINE];
+static int last_level;
+static int repetition;
void vreport2(int errlevel, const char *id, const char *fmt, va_list ap)
{
-    char buf[BUFSIZ];
+    char buf[MAX_LOGLINE];
if (errlevel > logger.debugLevel) {
return;
@@ -124,15 +143,21 @@ void vreport2(int errlevel, const char *id, const char *fmt, va_list ap)
vsnprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), fmt, ap);
-    pthread_mutex_lock(&reportMutex);
-    if (logger.use_syslog) {
-        syslog(errlevel, "%s", buf);
-    } else {
-        my_log3000(buf);
+    if (strncmp(buf, last_msg, strlen(buf)) == 0) {
+      repetition++;
+      return;
+    }
+    if (repetition) {
+      char tmp[80];
+      snprintf(tmp, sizeof(tmp), "... message repeated %d times\n", repetition);
+      do_emit(last_level, tmp);
}
-    pthread_mutex_unlock(&reportMutex);
+    repetition = 0;
+    memcpy(last_msg, buf, sizeof(last_msg));
+    last_level = errlevel;
+    do_emit(errlevel, buf);
}
#if 0