Merge branch 'devel' of https://github.com/DeRuina/timberjack into devel

Author: DeRuina

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.3.6](https://github.com/DeRuina/timberjack/compare/v1.3.5...v1.3.6) (2025-09-16)
+
+### Features
+
+* Append the backupTimeFormat to the end of file name ([#40](https://github.com/DeRuina/timberjack/issues/37)) ([15c6d81](https://github.com/DeRuina/timberjack/commit/15c6d813214c9c7f1372af55f9b705d9d2a3a88e))
+
+
 ## [1.3.5](https://github.com/DeRuina/timberjack/compare/v1.3.4...v1.3.5) (2025-08-19)
 
 ### Features

README.md

@@ -118,6 +118,7 @@ type Logger struct {
     // Back-compat shim for old configs; will be removed in v2.
     Compress          bool
 
+
     RotationInterval  time.Duration // Rotate after this duration (if > 0)
     RotateAtMinutes   []int         // Specific minutes within an hour (0–59) to trigger rotation
     RotateAt          []string      // Specific daily times (HH:MM, 24-hour) to trigger rotation
@@ -152,7 +153,9 @@ For example:
 ```
 
 If you prefer the extension to stay attached to the live name (better shell TAB completion),
+
 set `AppendTimeAfterExt: true`:
+
 ```
 <name>.log-<timestamp>-<reason>
 ```

timberjack.go

@@ -172,6 +172,7 @@ type Logger struct {
 	// true:             <name>.log-<timestamp>-<reason>
 	AppendTimeAfterExt bool `json:"appendTimeAfterExt" yaml:"appendTimeAfterExt"`
 
+
 	// Internal fields
 	size             int64     // current size of the log file
 	file             *os.File  // current log file
@@ -646,6 +647,7 @@ func (l *Logger) openNew(reasonForBackup string) error {
 		}
 
 		newname := backupName(name, l.LocalTime, reasonForBackup, rotationTimeForBackup, l.BackupTimeFormat, l.AppendTimeAfterExt)
+
 		if errRename := osRename(name, newname); errRename != nil {
 			return fmt.Errorf("can't rename log file: %s", errRename)
 		}
@@ -692,6 +694,7 @@ func (l *Logger) shouldTimeRotate() bool {
 // ("time" or "size") between the filename prefix and the extension.
 // It uses the local time if requested (otherwise UTC).
 func backupName(name string, local bool, reason string, t time.Time, fileTimeFormat string, appendTimeAfterExt bool) string {
+
 	dir := filepath.Dir(name)
 	filename := filepath.Base(name)
 	ext := filepath.Ext(filename)
@@ -703,6 +706,7 @@ func backupName(name string, local bool, reason string, t time.Time, fileTimeFor
 	}
 	// Format the timestamp for the backup file.
 	timestamp := t.In(currentLoc).Format(fileTimeFormat)
+
 	if appendTimeAfterExt {
 		// <name><ext>-<ts>-<reason>
 		// e.g. httpd.log-2025-01-01T00-00-00.000-size
@@ -963,6 +967,7 @@ func (l *Logger) timeFromName(filename, prefix, ext string) (time.Time, error) {
 	}
 
 	if !l.AppendTimeAfterExt {
+
 		// Keep legacy behavior for error messages to satisfy existing tests
 		if !strings.HasPrefix(filename, prefix) {
 			return time.Time{}, errors.New("mismatched prefix")
@@ -994,6 +999,7 @@ func (l *Logger) timeFromName(filename, prefix, ext string) (time.Time, error) {
 
 	// nameNoComp = "<base>-<timestamp>-<reason>"
 	trimmed := nameNoComp[len(base)+1:]
+
 	lastHyphenIdx := strings.LastIndex(trimmed, "-")
 	if lastHyphenIdx == -1 {
 		return time.Time{}, fmt.Errorf("malformed backup filename: %q", filename)