backporting of LOGBACK-1175

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
qos-ch · Jul 16, 2021 · 40c95cb · kisssadam · Sep 6, 2021 · yinghuzhu
1 parent acdf468
commit 40c95cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java
@@ -199,7 +199,7 @@ public String toRegexForFixedDate(Date date) {
             if (p instanceof LiteralConverter) {
                 buf.append(p.convert(null));
             } else if (p instanceof IntegerTokenConverter) {
-                buf.append("(\\d{1,3})");
+                buf.append("(\\d{1,5})");
             } else if (p instanceof DateTokenConverter) {
                 buf.append(p.convert(date));
             }

diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/FileNamePatternTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/FileNamePatternTest.java
@@ -151,12 +151,12 @@ public void asRegexByDate() {
         {
             FileNamePattern fnp = new FileNamePattern("foo-%d{yyyy.MM.dd}-%i.txt", context);
             String regex = fnp.toRegexForFixedDate(cal.getTime());
-            assertEquals("foo-2003.05.20-(\\d{1,3}).txt", regex);
+            assertEquals("foo-2003.05.20-(\\d{1,5}).txt", regex);
         }
         {
             FileNamePattern fnp = new FileNamePattern("\\toto\\foo-%d{yyyy\\MM\\dd}-%i.txt", context);
             String regex = fnp.toRegexForFixedDate(cal.getTime());
-            assertEquals("/toto/foo-2003/05/20-(\\d{1,3}).txt", regex);
+            assertEquals("/toto/foo-2003/05/20-(\\d{1,5}).txt", regex);
         }
     }