LOGBOX-79 #resolve

new rolling appender property archiveLayout which is a closure that returns the pattern of the archive layout
ColdBox · Nov 2, 2023 · e9172e3 · e9172e3
1 parent 27c0fe3
commit e9172e3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/system/logging/appenders/RollingFileAppender.cfc b/system/logging/appenders/RollingFileAppender.cfc
@@ -40,14 +40,33 @@ component accessors="true" extends="coldbox.system.logging.appenders.FileAppende
 			setProperty( "fileMaxArchives", "10" );
 		}
 		if ( !propertyExists( "archiveLayout" ) ) {
-			setProperty( "archiveLayout", "" );
+			setProperty( "archiveLayout", variables.getDefaultArchiveLayout );
 		}
 
 		variables.fileRotator = new coldbox.system.logging.util.FileRotator();
 
 		return this;
 	}
 
+	/**
+	 * Get the default archive layout:
+	 * <code>#filename#-#yyy-mm-dd#-#hh-mm#-#archiveNumber#</code>
+	 * DO NOT ADD EXTENSION TO IT, WE WILL ADD IT
+	 *
+	 * @filename     The filename to use for the archive layout
+	 * @archiveCount The archive count
+	 *
+	 * @return The default archive layout
+	 */
+	function getDefaultArchiveLayout( required filename, required archiveCount ){
+		return arguments.fileName &
+		"-" &
+		dateFormat( now(), "yyyy-mm-dd" ) &
+		"-" &
+		timeFormat( now(), "HH-mm" ) &
+		"-#arguments.archiveCount + 1#";
+	}
+
 	/**
 	 * Called upon registration
 	 */

diff --git a/system/logging/util/FileRotator.cfc b/system/logging/util/FileRotator.cfc
@@ -49,13 +49,9 @@ component accessors="true" {
 				}
 
 				//  Set the name of the archive
-				var zipFileName = getDirectoryFromPath( logFullPath ) &
-				fileName &
-				"-" &
-				dateFormat( now(), "yyyy-mm-dd" ) &
-				"-" &
-				timeFormat( now(), "HH-mm" ) &
-				"-#qArchivedLogs.recordcount + 1#" &
+				var archiveLayout = appender.getProperty( "archiveLayout" );
+				var zipFileName   = getDirectoryFromPath( logFullPath ) &
+				archiveLayout( fileName, qArchivedLogs.recordcount ) &
 				".zip";
 
 				arguments.appender.lock( () => {