From: Oleg Vasilev <oleg.vasilev@virtuozzo.com>
Date: Mon, 30 Jan 2023 15:00:02 +0000 (+0600)
Subject: logging: use the log cleaner
X-Git-Tag: v9.1.0-rc1~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=515b24228fb2d0bb3e21b29d6e648f9d1698e943;p=thirdparty%2Flibvirt.git

logging: use the log cleaner

Actually use the log cleaner introduced by previous commit.

Signed-off-by: Oleg Vasilev <oleg.vasilev@virtuozzo.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c
index 8fc7e9b2a8..a739211c7c 100644
--- a/src/logging/log_handler.c
+++ b/src/logging/log_handler.c
@@ -21,6 +21,7 @@
 #include <config.h>
 
 #include "log_handler.h"
+#include "log_cleaner.h"
 #include "virerror.h"
 #include "virfile.h"
 #include "viralloc.h"
@@ -175,7 +176,15 @@ virLogHandlerNew(bool privileged,
     handler->inhibitor = inhibitor;
     handler->opaque = opaque;
 
+    if (virLogCleanerInit(handler) < 0) {
+        goto error;
+    }
+
     return handler;
+
+ error:
+    virObjectUnref(handler);
+    return NULL;
 }
 
 
@@ -313,6 +322,8 @@ virLogHandlerDispose(void *obj)
     virLogHandler *handler = obj;
     size_t i;
 
+    virLogCleanerShutdown(handler);
+
     for (i = 0; i < handler->nfiles; i++) {
         handler->inhibitor(false, handler->opaque);
         virLogHandlerLogFileFree(handler->files[i]);