AuditService: Event Date Time differs in same Audit Message sent to m…

…ultiple Audit Record Repositories #1355
dcm4che · Apr 23, 2018 · b57f149 · b57f149
1 parent f289d95
commit b57f149
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditService.java b/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditService.java
@@ -406,7 +406,7 @@ void spoolSoftwareConfiguration(SoftwareConfiguration softwareConfiguration) {
         AuditInfoBuilder info = request != null
                 ? buildSoftwareConfAuditForWeb(request, deviceName)
                 : buildSystemTriggeredSoftwareConfAudit(deviceName);
-        writeSpoolFile(AuditServiceUtils.EventType.LDAP_CHNGS, info, softwareConfiguration.getLdapDiff().toString());
+        writeSpoolFile(info, softwareConfiguration.getLdapDiff().toString());
     }
 
     private AuditInfoBuilder buildSoftwareConfAuditForWeb(HttpServletRequest request, String deviceName) {
@@ -1741,9 +1741,9 @@ private Path toDirPath(AuditLogger auditLogger) {
                 auditLogger.getCommonName().replaceAll(" ", "_"));
     }
 
-    private void writeSpoolFile(AuditServiceUtils.EventType eventType, AuditInfoBuilder auditInfoBuilder, String data) {
+    private void writeSpoolFile(AuditInfoBuilder auditInfoBuilder, String data) {
         if (auditInfoBuilder == null) {
-            LOG.warn("Attempt to write empty file : ", eventType);
+            LOG.warn("Attempt to write empty file : ", AuditServiceUtils.EventType.LDAP_CHNGS);
             return;
         }
         FileTime eventTime = FileTime.fromMillis(System.currentTimeMillis());
@@ -1754,7 +1754,7 @@ private void writeSpoolFile(AuditServiceUtils.EventType eventType, AuditInfoBuil
                 Path dir = toDirPath(auditLogger);
                 try {
                     Files.createDirectories(dir);
-                    Path file = Files.createTempFile(dir, String.valueOf(eventType), null);
+                    Path file = Files.createTempFile(dir, AuditServiceUtils.EventType.LDAP_CHNGS.name(), null);
                     try (SpoolFileWriter writer = new SpoolFileWriter(Files.newBufferedWriter(file, StandardCharsets.UTF_8,
                             StandardOpenOption.APPEND))) {
                         writer.writeLine(new AuditInfo(auditInfoBuilder), data);
@@ -1774,6 +1774,7 @@ private void writeSpoolFile(AuditServiceUtils.EventType eventType, AuditInfoBuil
             LOG.warn("Attempt to write empty file : ", eventType);
             return;
         }
+        FileTime eventTime = FileTime.fromMillis(System.currentTimeMillis());
         boolean auditAggregate = getArchiveDevice().isAuditAggregate();
         AuditLoggerDeviceExtension ext = device.getDeviceExtension(AuditLoggerDeviceExtension.class);
         for (AuditLogger auditLogger : ext.getAuditLoggers()) {
@@ -1789,8 +1790,8 @@ private void writeSpoolFile(AuditServiceUtils.EventType eventType, AuditInfoBuil
                                 StandardOpenOption.APPEND))) {
                             writer.writeLine(new AuditInfo(auditInfoBuilder));
                         }
-                        out.close();
                     }
+                    Files.setLastModifiedTime(file, eventTime);
                     if (!auditAggregate)
                         auditAndProcessFile(auditLogger, file);
                 } catch (Exception e) {
@@ -1805,6 +1806,7 @@ private void writeSpoolFile(AuditServiceUtils.EventType eventType, AuditInfoBuil
             LOG.warn("Attempt to write empty file : ", eventType);
             return;
         }
+        FileTime eventTime = FileTime.fromMillis(System.currentTimeMillis());
         boolean auditAggregate = getArchiveDevice().isAuditAggregate();
         AuditLoggerDeviceExtension ext = device.getDeviceExtension(AuditLoggerDeviceExtension.class);
         for (AuditLogger auditLogger : ext.getAuditLoggers()) {
@@ -1818,6 +1820,7 @@ private void writeSpoolFile(AuditServiceUtils.EventType eventType, AuditInfoBuil
                         for (AuditInfoBuilder auditInfoBuilder : auditInfoBuilders)
                             writer.writeLine(new AuditInfo(auditInfoBuilder));
                     }
+                    Files.setLastModifiedTime(file, eventTime);
                     if (!auditAggregate)
                         auditAndProcessFile(auditLogger, file);
                 } catch (Exception e) {
@@ -1832,6 +1835,7 @@ private void writeSpoolFileStoreOrWadoRetrieve(String fileName, AuditInfoBuilder
             LOG.warn("Attempt to write empty file : " + fileName);
             return;
         }
+        FileTime eventTime = FileTime.fromMillis(System.currentTimeMillis());
         boolean auditAggregate = getArchiveDevice().isAuditAggregate();
         AuditLoggerDeviceExtension ext = device.getDeviceExtension(AuditLoggerDeviceExtension.class);
         for (AuditLogger auditLogger : ext.getAuditLoggers()) {
@@ -1849,6 +1853,7 @@ private void writeSpoolFileStoreOrWadoRetrieve(String fileName, AuditInfoBuilder
                         }
                         writer.writeLine(new AuditInfo(instanceInfo));
                     }
+                    Files.setLastModifiedTime(file, eventTime);
                     if (!auditAggregate)
                         auditAndProcessFile(auditLogger, file);
                 } catch (Exception e) {