External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

logging: refactor to store config inside log handler

Browse Source 
Signed-off-by: Oleg Vasilev <oleg.vasilev@virtuozzo.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Oleg Vasilev 2023-01-30 20:59:58 +06:00 committed by Martin Kletzander
parent b155bd095f
commit 00e682741c
3 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/logging/log_daemon.c
View File

@ -145,8 +145,7 @@ virLogDaemonNew(virLogDaemonConfig *config, bool privileged)
g_clear_pointer(&srv, virObjectUnref); g_clear_pointer(&srv, virObjectUnref);
if (!(logd->handler = virLogHandlerNew(privileged, if (!(logd->handler = virLogHandlerNew(privileged,
config->max_size, config,
config->max_backups,
virLogDaemonInhibitor, virLogDaemonInhibitor,
logd))) logd)))
goto error; goto error;
@ -231,8 +230,7 @@ virLogDaemonNewPostExecRestart(virJSONValue *object, bool privileged,
if (!(logd->handler = virLogHandlerNewPostExecRestart(child, if (!(logd->handler = virLogHandlerNewPostExecRestart(child,
privileged, privileged,
config->max_size, config,
config->max_backups,
virLogDaemonInhibitor, virLogDaemonInhibitor,
logd))) logd)))
goto error; goto error;

29
src/logging/log_handler.c
View File

@ -58,8 +58,7 @@ struct _virLogHandler {
virObjectLockable parent; virObjectLockable parent;
bool privileged; bool privileged;
size_t max_size; virLogDaemonConfig *config;
size_t max_backups;
virLogHandlerLogFile **files; virLogHandlerLogFile **files;
size_t nfiles; size_t nfiles;
@ -185,8 +184,7 @@ virLogHandlerDomainLogFileEvent(int watch,
virLogHandler * virLogHandler *
virLogHandlerNew(bool privileged, virLogHandlerNew(bool privileged,
size_t max_size, virLogDaemonConfig *config,
size_t max_backups,
virLogHandlerShutdownInhibitor inhibitor, virLogHandlerShutdownInhibitor inhibitor,
void *opaque) void *opaque)
{ {
@ -199,8 +197,7 @@ virLogHandlerNew(bool privileged,
return NULL; return NULL;
handler->privileged = privileged; handler->privileged = privileged;
handler->max_size = max_size; handler->config = config;
handler->max_backups = max_backups;
handler->inhibitor = inhibitor; handler->inhibitor = inhibitor;
handler->opaque = opaque; handler->opaque = opaque;
@ -253,8 +250,8 @@ virLogHandlerLogFilePostExecRestart(virLogHandler *handler,
} }
if ((file->file = virRotatingFileWriterNew(path, if ((file->file = virRotatingFileWriterNew(path,
handler->max_size, handler->config->max_size,
handler->max_backups, handler->config->max_backups,
false, false,
DEFAULT_MODE)) == NULL) DEFAULT_MODE)) == NULL)
goto error; goto error;
@ -282,8 +279,7 @@ virLogHandlerLogFilePostExecRestart(virLogHandler *handler,
virLogHandler * virLogHandler *
virLogHandlerNewPostExecRestart(virJSONValue *object, virLogHandlerNewPostExecRestart(virJSONValue *object,
bool privileged, bool privileged,
size_t max_size, virLogDaemonConfig *config,
size_t max_backups,
virLogHandlerShutdownInhibitor inhibitor, virLogHandlerShutdownInhibitor inhibitor,
void *opaque) void *opaque)
{ {
@ -292,8 +288,7 @@ virLogHandlerNewPostExecRestart(virJSONValue *object,
size_t i; size_t i;
if (!(handler = virLogHandlerNew(privileged, if (!(handler = virLogHandlerNew(privileged,
max_size, config,
max_backups,
inhibitor, inhibitor,
opaque))) opaque)))
return NULL; return NULL;
@ -393,8 +388,8 @@ virLogHandlerDomainOpenLogFile(virLogHandler *handler,
file->domname = g_strdup(domname); file->domname = g_strdup(domname);
if ((file->file = virRotatingFileWriterNew(path, if ((file->file = virRotatingFileWriterNew(path,
handler->max_size, handler->config->max_size,
handler->max_backups, handler->config->max_backups,
trunc, trunc,
DEFAULT_MODE)) == NULL) DEFAULT_MODE)) == NULL)
goto error; goto error;
@ -525,7 +520,7 @@ virLogHandlerDomainReadLogFile(virLogHandler *handler,
virObjectLock(handler); virObjectLock(handler);
if (!(file = virRotatingFileReaderNew(path, handler->max_backups))) if (!(file = virRotatingFileReaderNew(path, handler->config->max_backups)))
goto error; goto error;
if (virRotatingFileReaderSeek(file, inode, offset) < 0) if (virRotatingFileReaderSeek(file, inode, offset) < 0)
@ -579,8 +574,8 @@ virLogHandlerDomainAppendLogFile(virLogHandler *handler,
if (!writer) { if (!writer) {
if (!(newwriter = virRotatingFileWriterNew(path, if (!(newwriter = virRotatingFileWriterNew(path,
handler->max_size, handler->config->max_size,
handler->max_backups, handler->config->max_backups,
false, false,
DEFAULT_MODE))) DEFAULT_MODE)))
goto cleanup; goto cleanup;

7
src/logging/log_handler.h
View File

@ -22,6 +22,7 @@
#include "internal.h" #include "internal.h"
#include "virjson.h" #include "virjson.h"
#include "log_daemon_config.h"
typedef struct _virLogHandler virLogHandler; typedef struct _virLogHandler virLogHandler;
@ -30,14 +31,12 @@ typedef void (*virLogHandlerShutdownInhibitor)(bool inhibit,
void *opaque); void *opaque);
virLogHandler *virLogHandlerNew(bool privileged, virLogHandler *virLogHandlerNew(bool privileged,
size_t max_size, virLogDaemonConfig *config,
size_t max_backups,
virLogHandlerShutdownInhibitor inhibitor, virLogHandlerShutdownInhibitor inhibitor,
void *opaque); void *opaque);
virLogHandler *virLogHandlerNewPostExecRestart(virJSONValue *child, virLogHandler *virLogHandlerNewPostExecRestart(virJSONValue *child,
bool privileged, bool privileged,
size_t max_size, virLogDaemonConfig *config,
size_t max_backups,
virLogHandlerShutdownInhibitor inhibitor, virLogHandlerShutdownInhibitor inhibitor,
void *opaque); void *opaque);