Matej Habrnal 0b651c
From 03c64e1439baf60426b002ecb1b7052a426d348e Mon Sep 17 00:00:00 2001
Matej Habrnal 0b651c
From: Jakub Filak <jfilak@redhat.com>
Matej Habrnal 0b651c
Date: Wed, 27 Aug 2014 09:30:54 +0200
Matej Habrnal 0b651c
Subject: [PATCH] logging: less log messages for duplicates
Matej Habrnal 0b651c
Matej Habrnal 0b651c
Related to rhbz#1133674
Matej Habrnal 0b651c
Matej Habrnal 0b651c
Signed-off-by: Jakub Filak <jfilak@redhat.com>
Matej Habrnal 0b651c
---
Matej Habrnal 0b651c
 src/daemon/abrt-handle-event.c | 4 ++--
Matej Habrnal 0b651c
 src/daemon/abrt-server.c       | 5 ++---
Matej Habrnal 0b651c
 2 files changed, 4 insertions(+), 5 deletions(-)
Matej Habrnal 0b651c
Matej Habrnal 0b651c
diff --git a/src/daemon/abrt-handle-event.c b/src/daemon/abrt-handle-event.c
Matej Habrnal 0b651c
index a65f86e..2ed88db 100644
Matej Habrnal 0b651c
--- a/src/daemon/abrt-handle-event.c
Matej Habrnal 0b651c
+++ b/src/daemon/abrt-handle-event.c
Matej Habrnal 0b651c
@@ -142,7 +142,7 @@ static int dup_uuid_compare(const struct dump_dir *dd)
Matej Habrnal 0b651c
     free(dd_uuid);
Matej Habrnal 0b651c
 
Matej Habrnal 0b651c
     if (!different)
Matej Habrnal 0b651c
-        log("Duplicate: UUID");
Matej Habrnal 0b651c
+        log_notice("Duplicate: UUID");
Matej Habrnal 0b651c
 
Matej Habrnal 0b651c
     return !different;
Matej Habrnal 0b651c
 }
Matej Habrnal 0b651c
@@ -197,7 +197,7 @@ static int dup_corebt_compare(const struct dump_dir *dd)
Matej Habrnal 0b651c
     free(dd_corebt);
Matej Habrnal 0b651c
 
Matej Habrnal 0b651c
     if (isdup)
Matej Habrnal 0b651c
-        log("Duplicate: core backtrace");
Matej Habrnal 0b651c
+        log_notice("Duplicate: core backtrace");
Matej Habrnal 0b651c
 
Matej Habrnal 0b651c
     return isdup;
Matej Habrnal 0b651c
 }
Matej Habrnal 0b651c
diff --git a/src/daemon/abrt-server.c b/src/daemon/abrt-server.c
Matej Habrnal 0b651c
index 307b41b..9951468 100644
Matej Habrnal 0b651c
--- a/src/daemon/abrt-server.c
Matej Habrnal 0b651c
+++ b/src/daemon/abrt-server.c
Matej Habrnal 0b651c
@@ -194,15 +194,14 @@ static int run_post_create(const char *dirname)
Matej Habrnal 0b651c
             strbuf_append_str(cmd_output, raw);
Matej Habrnal 0b651c
             char *msg = cmd_output->buf;
Matej Habrnal 0b651c
 
Matej Habrnal 0b651c
-            /* Hmm, DUP_OF_DIR: ends up in syslog. move log() into 'else'? */
Matej Habrnal 0b651c
-            log("%s", msg);
Matej Habrnal 0b651c
-
Matej Habrnal 0b651c
             if (child_is_post_create
Matej Habrnal 0b651c
              && prefixcmp(msg, "DUP_OF_DIR: ") == 0
Matej Habrnal 0b651c
             ) {
Matej Habrnal 0b651c
                 free(dup_of_dir);
Matej Habrnal 0b651c
                 dup_of_dir = xstrdup(msg + strlen("DUP_OF_DIR: "));
Matej Habrnal 0b651c
             }
Matej Habrnal 0b651c
+            else
Matej Habrnal 0b651c
+                log("%s", msg);
Matej Habrnal 0b651c
 
Matej Habrnal 0b651c
             strbuf_clear(cmd_output);
Matej Habrnal 0b651c
             /* jump to next line */
Matej Habrnal 0b651c
-- 
Matej Habrnal 0b651c
1.9.3
Matej Habrnal 0b651c