Change rolled over log file suffix to .rolled-over.log

newrelic · Jan 15, 2025 · a5de389 · a5de389
1 parent 56e0011
commit a5de389
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...ent/src/main/java/com/newrelic/agent/security/intcodeagent/filelogging/InitLogWriter.java b/...ent/src/main/java/com/newrelic/agent/security/intcodeagent/filelogging/InitLogWriter.java
@@ -192,7 +192,7 @@ private static void rollover(String fileName) throws IOException {
             if (Files.size(currentFile.toPath()) > maxFileSize) {
                 try (FileLock lock = FileChannel.open(currentFile.toPath(), StandardOpenOption.WRITE).lock()) {
                     if (lock.isValid() && currentFile.exists() && Files.size(currentFile.toPath()) > maxFileSize) {
-                        File rolloverFile = new File(fileName + STRING_DOT + Instant.now().toEpochMilli());
+                        File rolloverFile = new File(fileName + STRING_DOT + Instant.now().toEpochMilli() + STRING_DOT + "rolled-over.log");
                         FileUtils.moveFile(currentFile, rolloverFile);
                     }
                     lock.release();

diff --git a/...ent/src/main/java/com/newrelic/agent/security/intcodeagent/filelogging/LogFileHelper.java b/...ent/src/main/java/com/newrelic/agent/security/intcodeagent/filelogging/LogFileHelper.java
@@ -72,7 +72,7 @@ public static boolean isDailyRollover() {
     }
 
     public static void deleteRolloverLogFiles(String fileName, long max) {
-        Collection<File> rolloverLogFiles = FileUtils.listFiles(new File(OsVariablesInstance.getInstance().getOsVariables().getLogDirectory()), FileFilterUtils.and(FileFilterUtils.prefixFileFilter(fileName + "."), FileFilterUtils.suffixFileFilter(".log")), null);
+        Collection<File> rolloverLogFiles = FileUtils.listFiles(new File(OsVariablesInstance.getInstance().getOsVariables().getLogDirectory()), FileFilterUtils.and(FileFilterUtils.prefixFileFilter(fileName + "."), FileFilterUtils.suffixFileFilter(".rolled-over.log")), null);
 
         if (rolloverLogFiles.size() > max) {
             File[] sortedLogFiles = rolloverLogFiles.toArray(new File[0]);

diff --git a/...y-agent/src/main/java/com/newrelic/agent/security/intcodeagent/filelogging/LogWriter.java b/...y-agent/src/main/java/com/newrelic/agent/security/intcodeagent/filelogging/LogWriter.java
@@ -194,7 +194,7 @@ private static void rollover(String fileName) throws IOException {
             if (Files.size(currentFile.toPath()) > maxFileSize) {
                 try (FileLock lock = FileChannel.open(currentFile.toPath(), StandardOpenOption.WRITE).lock()) {
                     if (lock.isValid() && currentFile.exists() && Files.size(currentFile.toPath()) > maxFileSize) {
-                        File rolloverFile = new File(fileName + STRING_DOT + Instant.now().toEpochMilli());
+                        File rolloverFile = new File(fileName + STRING_DOT + Instant.now().toEpochMilli() + STRING_DOT + "rolled-over.log");
                         FileUtils.moveFile(currentFile, rolloverFile);
                     }
                     lock.release();