You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2018/09/22 03:26:15 UTC
[1/4] logging-log4j-audit git commit: [LOG4J2-2442] Extract common
code to a single method
Repository: logging-log4j-audit
Updated Branches:
refs/heads/master 65ccad83e -> 7660899fc
[LOG4J2-2442] Extract common code to a single method
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/commit/04ab4e64
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/tree/04ab4e64
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/diff/04ab4e64
Branch: refs/heads/master
Commit: 04ab4e64bf77408149a9eb835741b689cc558b44
Parents: c2bfa53
Author: Andrei Ivanov <an...@arnia.ro>
Authored: Sun Sep 16 17:13:18 2018 +0300
Committer: Andrei Ivanov <an...@arnia.ro>
Committed: Sun Sep 16 17:13:18 2018 +0300
----------------------------------------------------------------------
.../logging/log4j/audit/AbstractEventLogger.java | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/04ab4e64/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java
----------------------------------------------------------------------
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java
index da2254a..ac0bb54 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java
@@ -79,24 +79,19 @@ public abstract class AbstractEventLogger {
}
public void logEvent(String eventName, Map<String, String> attributes) {
- Event event = catalogManager.getEvent(eventName);
- if (event == null) {
- throw new AuditException("Unable to locate definition of audit event " + eventName);
- }
- logEvent(eventName, attributes, event, defaultAuditExceptionHandler);
+ logEvent(eventName, null, attributes, defaultAuditExceptionHandler);
}
public void logEvent(String eventName, String catalogId, Map<String, String> attributes) {
- Event event = catalogManager.getEvent(eventName, catalogId);
- if (event == null) {
- throw new AuditException("Unable to locate definition of audit event " + eventName);
- }
- logEvent(eventName, attributes, event, defaultAuditExceptionHandler);
+ logEvent(eventName, catalogId, attributes, defaultAuditExceptionHandler);
}
public void logEvent(String eventName, Map<String, String> attributes, AuditExceptionHandler exceptionHandler) {
- Event event = catalogManager.getEvent(eventName);
+ logEvent(eventName, null, attributes, exceptionHandler);
+ }
+ private void logEvent(String eventName, String catalogId, Map<String, String> attributes, AuditExceptionHandler exceptionHandler) {
+ Event event = catalogId == null ? catalogManager.getEvent(eventName) : catalogManager.getEvent(eventName, catalogId);
if (event == null) {
throw new AuditException("Unable to locate definition of audit event " + eventName);
}
[3/4] logging-log4j-audit git commit: Closes #5
Posted by rg...@apache.org.
Closes #5
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/commit/4552b251
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/tree/4552b251
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/diff/4552b251
Branch: refs/heads/master
Commit: 4552b251ea5bf54a9dd10cb9a3b856457b971ad0
Parents: 65ccad8 eefa81f
Author: Ralph Goers <rg...@apache.org>
Authored: Fri Sep 21 17:23:41 2018 -1000
Committer: Ralph Goers <rg...@apache.org>
Committed: Fri Sep 21 17:23:41 2018 -1000
----------------------------------------------------------------------
.../log4j/audit/AbstractEventLogger.java | 23 +++++++++-----------
.../logging/log4j/audit/AuditLoggerTest.java | 5 +++--
2 files changed, 13 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
[2/4] logging-log4j-audit git commit: [LOG4J2-2442] normalize the
event name
Posted by rg...@apache.org.
[LOG4J2-2442] normalize the event name
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/commit/eefa81ff
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/tree/eefa81ff
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/diff/eefa81ff
Branch: refs/heads/master
Commit: eefa81ffbb178ff4153a05946cc42759f85e1a21
Parents: 04ab4e6
Author: Andrei Ivanov <an...@arnia.ro>
Authored: Sun Sep 16 17:15:30 2018 +0300
Committer: Andrei Ivanov <an...@arnia.ro>
Committed: Sun Sep 16 17:15:30 2018 +0300
----------------------------------------------------------------------
.../org/apache/logging/log4j/audit/AbstractEventLogger.java | 8 +++++---
.../java/org/apache/logging/log4j/audit/AuditLoggerTest.java | 5 +++--
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/eefa81ff/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java
----------------------------------------------------------------------
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java
index ac0bb54..22ec90f 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java
@@ -21,6 +21,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.audit.catalog.CatalogManager;
import org.apache.logging.log4j.audit.exception.AuditException;
+import org.apache.logging.log4j.audit.util.NamingUtils;
import org.apache.logging.log4j.catalog.api.Attribute;
import org.apache.logging.log4j.catalog.api.Constraint;
import org.apache.logging.log4j.catalog.api.Event;
@@ -91,11 +92,12 @@ public abstract class AbstractEventLogger {
}
private void logEvent(String eventName, String catalogId, Map<String, String> attributes, AuditExceptionHandler exceptionHandler) {
- Event event = catalogId == null ? catalogManager.getEvent(eventName) : catalogManager.getEvent(eventName, catalogId);
+ String eventId = NamingUtils.lowerFirst(eventName);
+ Event event = catalogId == null ? catalogManager.getEvent(eventId) : catalogManager.getEvent(eventId, catalogId);
if (event == null) {
- throw new AuditException("Unable to locate definition of audit event " + eventName);
+ throw new AuditException("Unable to locate definition of audit event " + eventId);
}
- logEvent(eventName, attributes, event, exceptionHandler);
+ logEvent(eventId, attributes, event, exceptionHandler);
}
protected abstract void logEvent(StructuredDataMessage message);
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/eefa81ff/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/AuditLoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/AuditLoggerTest.java b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/AuditLoggerTest.java
index abe6eb8..77ee464 100644
--- a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/AuditLoggerTest.java
+++ b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/AuditLoggerTest.java
@@ -85,7 +85,7 @@ public class AuditLoggerTest {
properties.put("fromAccount", "111111");
properties.put("amount", "111.55");
try {
- auditLogger.logEvent("transfer", properties);
+ auditLogger.logEvent("Transfer", properties);
} catch (Exception ex) {
ex.printStackTrace();
fail();
@@ -94,6 +94,7 @@ public class AuditLoggerTest {
assertNotNull("No messages", msgs);
assertTrue("No messages", msgs.size() == 1);
String msg = msgs.get(0);
+ assertTrue("Normalized event name", msg.contains("transfer@"));
assertTrue("No companyId", msg.contains("companyId=\"12345\""));
assertTrue("No ipAddress", msg.contains("ipAddress=\"127.0.0.1\""));
assertTrue("No toAccount", msg.contains("toAccount=\"123456\""));
@@ -110,6 +111,6 @@ public class AuditLoggerTest {
Map<String, String> properties = new HashMap<String, String>();
properties.put("toAccount", "123456");
properties.put("amount", "111.55");
- auditLogger.logEvent("transfer", properties);
+ auditLogger.logEvent("Transfer", properties);
}
}
[4/4] logging-log4j-audit git commit: LOG4J2-2442 - Normalize the
event names logged through AbstractEventLogger.logEvent
Posted by rg...@apache.org.
LOG4J2-2442 - Normalize the event names logged through AbstractEventLogger.logEvent
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/commit/7660899f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/tree/7660899f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/diff/7660899f
Branch: refs/heads/master
Commit: 7660899fc3b3c3db93cbe85a5671dfdf333b4be4
Parents: 4552b25
Author: Ralph Goers <rg...@apache.org>
Authored: Fri Sep 21 17:26:09 2018 -1000
Committer: Ralph Goers <rg...@apache.org>
Committed: Fri Sep 21 17:26:09 2018 -1000
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/7660899f/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index fc5cdcf..e0495ad 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,6 +31,9 @@
- "remove" - Removed
-->
<release version="1.0.1" date="YYYY-MM-DD" description="Release 1.0.1">
+ <action issue="LOG4J2-2442" dev="rgoers" type="fix" due-to="Andrei Ivanov">
+ Normalize the event names logged through AbstractEventLogger.logEvent.
+ </action>
<action issue="LOG4J2-2431" dev="rgoers" type="fix" due-to="Andrei Ivanov">
Narrow the return type of getEvent.
</action>