From 762e1afb03aa2a8b19dcd70f2ed862db8a7e4eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johana=20Sup=C3=ADkov=C3=A1?= Date: Tue, 9 Mar 2021 13:14:42 +0100 Subject: [PATCH] Logging complete message by AuditLogger AuditLogger now logs the whole audit message instead of just the event. --- .../metacentrum/perun/auditlogger/logger/EventLogger.java | 4 ++-- .../perun/auditlogger/logger/impl/EventLoggerImpl.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/perun-auditlogger/src/main/java/cz/metacentrum/perun/auditlogger/logger/EventLogger.java b/perun-auditlogger/src/main/java/cz/metacentrum/perun/auditlogger/logger/EventLogger.java index 53eac77596..ebe0586bd6 100644 --- a/perun-auditlogger/src/main/java/cz/metacentrum/perun/auditlogger/logger/EventLogger.java +++ b/perun-auditlogger/src/main/java/cz/metacentrum/perun/auditlogger/logger/EventLogger.java @@ -1,10 +1,10 @@ package cz.metacentrum.perun.auditlogger.logger; -import cz.metacentrum.perun.audit.events.AuditEvent; +import cz.metacentrum.perun.core.api.AuditMessage; public interface EventLogger extends Runnable { - public int logEvent(AuditEvent event); + public int logMessage(AuditMessage message); public void setLastProcessedIdNumber(int lastProcessedId); } diff --git a/perun-auditlogger/src/main/java/cz/metacentrum/perun/auditlogger/logger/impl/EventLoggerImpl.java b/perun-auditlogger/src/main/java/cz/metacentrum/perun/auditlogger/logger/impl/EventLoggerImpl.java index 529bd90d49..9e396b7675 100644 --- a/perun-auditlogger/src/main/java/cz/metacentrum/perun/auditlogger/logger/impl/EventLoggerImpl.java +++ b/perun-auditlogger/src/main/java/cz/metacentrum/perun/auditlogger/logger/impl/EventLoggerImpl.java @@ -108,7 +108,7 @@ public void run() { lastProcessedIdNumber, message.getId(), (lastProcessedIdNumber - message.getId())); } //IMPORTANT STEP2: send all messages to syslog - if(this.logEvent(message.getEvent()) == 0) { + if(this.logMessage(message) == 0) { messagesIterator.remove(); lastProcessedIdNumber = message.getId(); } else { @@ -146,9 +146,9 @@ public void run() { } @Override - public int logEvent(AuditEvent event) { + public int logMessage(AuditMessage message) { try { - syslog.info(mapper.writeValueAsString(event)); + syslog.info(mapper.writeValueAsString(message)); } catch (JsonProcessingException e) { return -1; }