fix: max number of log files not correctly enforced in high-volume logging circumstances (#5961)

* fix: max number of log files not correctly enforced

* refactor: use more apt name

Author: mattdibi

kura/distrib/src/main/resources/unfiltered/pkg/log4j/log4j.xml

@@ -27,18 +27,12 @@
                 <Pattern>%d{ISO8601} [%t] %-5p %c{1.} - %m%n%throwable{full}</Pattern>
             </PatternLayout>
         </Console>
-        <RollingFile name="RollingFile" fileName="${log_dir}/${log_name}.log"
-            filePattern="${log_dir}/${log_name}-%d{MM-dd-yy-HH-mm-ss}-%i.log.gz">
+        <File name="LoggingFile" fileName="${log_dir}/${log_name}.log">
             <PatternLayout>
                 <Pattern>%d{ISO8601} [%t] %-5p %c{1.} - %m%n%throwable{full}</Pattern>
             </PatternLayout>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="20 MB" />
-            </Policies>
-            <DefaultRolloverStrategy max="10" />
-        </RollingFile>
-        <RollingFile name="audit" fileName="${log_dir}/${log_name}-audit.log"
-            filePattern="${log_dir}/${log_name}-audit-%d{MM-dd-yy-HH-mm-ss}-%i.log.gz">
+        </File>
+        <File name="audit" fileName="${log_dir}/${log_name}-audit.log">
             <RFC5424Layout enterpriseNumber="28392" includeMDC="true" mdcId="RequestContext"
                 appName="EclipseKura" mdcPrefix="" newLine="true">
                 <LoggerFields>
@@ -48,29 +42,25 @@
                     <KeyValuePair key="exception" value="%ex" />
                 </LoggerFields>
             </RFC5424Layout>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="20 MB" />
-            </Policies>
-            <DefaultRolloverStrategy max="10" />
-        </RollingFile>
+        </File>
     </Appenders>
 
     <Loggers>
         <Logger name="org.eclipse" level="info" additivity="false">
             <AppenderRef ref="Console" />
-            <AppenderRef ref="RollingFile" />
+            <AppenderRef ref="LoggingFile" />
         </Logger>
         <Logger name="org.glassfish.jersey.internal" level="error" additivity="false">
             <AppenderRef ref="Console" />
-            <AppenderRef ref="RollingFile" />
+            <AppenderRef ref="LoggingFile" />
         </Logger>
         <Logger name="AuditLogger" level="trace" additivity="false">
             <AppenderRef ref="audit" />
         </Logger>
         <Root level="info">
             <AppenderRef ref="Console" />
-            <AppenderRef ref="RollingFile" />
+            <AppenderRef ref="LoggingFile" />
         </Root>
     </Loggers>
 
-</Configuration>
+</Configuration>