Skip to content

Commit df70c16

Browse files
vishesh92vishesh92
committed
log4j2: Use size based triggering instead of time based
1 parent 019f2c6 commit df70c16

File tree

8 files changed

+27
-14
lines changed

8 files changed

+27
-14
lines changed

‎agent/conf/log4j-cloud.xml.in‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@ under the License.
2525
<!-- ================================= -->
2626

2727
<!-- A time/date based rolling appender -->
28-
<RollingFile name="FILE" append="true" fileName="@AGENTLOG@" filePattern="@AGENTLOG@.%d{yyyy-MM-dd}.gz">
28+
<RollingFile name="FILE" append="true" fileName="@AGENTLOG@" filePattern="@AGENTLOG@.%i.gz">
2929
<ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
30+
<DefaultRolloverStrategy max="@LOGMAXINDEX@"/>
3031
<Policies>
31-
<TimeBasedTriggeringPolicy/>
32+
<SizeBasedTriggeringPolicy size="@LOGMAXFILESIZE@"/>
3233
</Policies>
3334
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
3435
</RollingFile>

‎build/replace.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ DBPW=cloud
2020
DBROOTPW=
2121
MSLOG=vmops.log
2222
APISERVERLOG=api.log
23+
LOGMAXINDEX=10
24+
LOGMAXFILESIZE=104857600
2325
DBHOST=localhost
2426
DBDRIVER=jdbc:mysql
2527
AGENTLOGDIR=logs

‎client/conf/log4j-cloud.xml.in‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,21 @@ under the License.
2929
<!-- ================================= -->
3030

3131
<!-- A regular appender -->
32-
<RollingFile name="FILE" append="true" fileName="@MSLOG@" filePattern="@MSLOG@.%d{yyyy-MM-dd}.gz">
32+
<RollingFile name="FILE" append="true" fileName="@MSLOG@" filePattern="@MSLOG@.%i.gz">
3333
<ThresholdFilter level="TRACE" onMatch="ACCEPT" onMismatch="DENY"/>
34+
<DefaultRolloverStrategy max="@LOGMAXINDEX@"/>
3435
<Policies>
35-
<TimeBasedTriggeringPolicy/>
36+
<SizeBasedTriggeringPolicy size="@LOGMAXFILESIZE@"/>
3637
</Policies>
3738
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
3839
</RollingFile>
3940

4041

41-
<RollingFile name="APISERVER" append="true" fileName="@APISERVERLOG@" filePattern="@APISERVERLOG@.%d{yyyy-MM-dd}.gz">
42+
<RollingFile name="APISERVER" append="true" fileName="@APISERVERLOG@" filePattern="@APISERVERLOG@.%i.gz">
4243
<ThresholdFilter level="DEBUG" onMatch="ACCEPT" onMismatch="DENY"/>
44+
<DefaultRolloverStrategy max="@LOGMAXINDEX@"/>
4345
<Policies>
44-
<TimeBasedTriggeringPolicy/>
46+
<SizeBasedTriggeringPolicy size="@LOGMAXFILESIZE@"/>
4547
</Policies>
4648
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
4749
</RollingFile>

‎packaging/debian/replace.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ MSCONF=/etc/cloudstack/management
4343
MSENVIRON=/usr/share/cloudstack-management
4444
MSLOG=/var/log/cloudstack/management/management-server.log
4545
MSLOGDIR=/var/log/cloudstack/management/
46+
LOGMAXINDEX=10
47+
LOGMAXFILESIZE=104857600
4648
MSMNTDIR=/var/lib/cloudstack/mnt
4749
MSUSER=cloud
4850
PIDDIR=/var/run

‎packaging/el8/replace.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ MSCONF=/etc/cloudstack/management
4343
MSENVIRON=/usr/share/cloudstack-management
4444
MSLOG=/var/log/cloudstack/management/management-server.log
4545
MSLOGDIR=/var/log/cloudstack/management/
46+
LOGMAXINDEX=10
47+
LOGMAXFILESIZE=104857600
4648
MSMNTDIR=/var/cloudstack/mnt
4749
MSUSER=cloud
4850
PIDDIR=/var/run

‎plugins/hypervisors/hyperv/conf/log4j-cloud.xml.in‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@ under the License.
2525
<!-- ================================= -->
2626

2727
<!-- A time/date based rolling appender -->
28-
<RollingFile name="FILE" append="true" fileName="@AGENTLOG@" filePattern="@AGENTLOG@.%d{yyyy-MM-dd}.gz">
28+
<RollingFile name="FILE" append="true" fileName="@AGENTLOG@" filePattern="@AGENTLOG@.%i.gz">
2929
<ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
30+
<DefaultRolloverStrategy max="@LOGMAXINDEX@"/>
3031
<Policies>
31-
<TimeBasedTriggeringPolicy/>
32+
<SizeBasedTriggeringPolicy size="@LOGMAXFILESIZE@"/>
3233
</Policies>
3334
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{3}] (%t:%x) %m%ex%n"/>
3435
</RollingFile>

‎server/conf/log4j-cloud.xml.in‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@ under the License.
2626

2727

2828
<!-- A regular appender -->
29-
<RollingFile name="FILE" append="true" fileName="@MSLOG@" filePattern="@MSLOG@.%d{yyyy-MM-dd}.gz">
29+
<RollingFile name="FILE" append="true" fileName="@MSLOG@" filePattern="@MSLOG@.%i.gz">
3030
<ThresholdFilter level="TRACE" onMatch="ACCEPT" onMismatch="DENY"/>
31+
<DefaultRolloverStrategy max="@LOGMAXINDEX@"/>
3132
<Policies>
32-
<TimeBasedTriggeringPolicy/>
33+
<SizeBasedTriggeringPolicy size="@LOGMAXFILESIZE@"/>
3334
</Policies>
3435
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) %m%ex%n"/>
3536
</RollingFile>
@@ -44,10 +45,11 @@ under the License.
4445
</RollingFile>
4546

4647

47-
<RollingFile name="APISERVER" append="true" fileName="@APISERVERLOG@" filePattern="@APISERVERLOG@.%d{yyyy-MM-dd}.gz">
48+
<RollingFile name="APISERVER" append="true" fileName="@APISERVERLOG@" filePattern="@APISERVERLOG@.%i.gz">
4849
<ThresholdFilter level="DEBUG" onMatch="ACCEPT" onMismatch="DENY"/>
50+
<DefaultRolloverStrategy max="@LOGMAXINDEX@"/>
4951
<Policies>
50-
<TimeBasedTriggeringPolicy/>
52+
<SizeBasedTriggeringPolicy size="@LOGMAXFILESIZE@"/>
5153
</Policies>
5254
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) %m%ex%n"/>
5355
</RollingFile>

‎usage/conf/log4j-cloud_usage.xml.in‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@ under the License.
3434
<!-- Append messages to the usage log -->
3535
<!-- ================================ -->
3636

37-
<RollingFile name="USAGE" append="true" fileName="@USAGELOG@" filePattern="@USAGELOG@.%d{yyyy-MM-dd}{GMT}.gz">
37+
<RollingFile name="USAGE" append="true" fileName="@USAGELOG@" filePattern="@USAGELOG@.%i.gz">
3838
<ThresholdFilter level="DEBUG" onMatch="ACCEPT" onMismatch="DENY"/>
39+
<DefaultRolloverStrategy max="@LOGMAXINDEX@"/>
3940
<Policies>
40-
<TimeBasedTriggeringPolicy/>
41+
<SizeBasedTriggeringPolicy size="@LOGMAXFILESIZE@"/>
4142
</Policies>
4243
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
4344
</RollingFile>

0 commit comments

Comments
 (0)