Merge pull request #302 from /issues/301-audit-writer-new-transaction

Fix #301: Change transaction propagation of DatabaseAuditWriter#flush to REQUIRES_NEW
wultra · Jun 14, 2024 · cca6ec0 · cca6ec0
2 parents 1c952d3 + 9f915e6
commit cca6ec0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/audit-base/src/main/java/com/wultra/core/audit/base/database/DatabaseAuditWriter.java b/audit-base/src/main/java/com/wultra/core/audit/base/database/DatabaseAuditWriter.java
@@ -31,6 +31,7 @@
 import org.springframework.jdbc.core.PreparedStatementCallback;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.support.TransactionTemplate;
 import org.springframework.util.StringUtils;
 
@@ -159,6 +160,7 @@ public void flush() {
         }
 
         synchronized (FLUSH_LOCK) {
+            transactionTemplate.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
             transactionTemplate.executeWithoutResult(status -> {
                 while (!queue.isEmpty()) {
                     try {

diff --git a/audit-base/src/test/resources/application.properties b/audit-base/src/test/resources/application.properties
@@ -1,2 +1,4 @@
 # Audit configuration
 spring.application.name=test-application
+
+spring.datasource.hikari.auto-commit=false