Skip to content

Commit 8155c04

Browse files
mikaylathompsonAndreKurait
mikaylathompson
and
AndreKurait
authored
Replayer logging changes (#1463)
* Support log config from a specified file Signed-off-by: Mikayla Thompson <[email protected]> * Update logging config to write uncompressed files locally Signed-off-by: Mikayla Thompson <[email protected]> * Update replayer log4j2 for minute rollover and size based triggering Signed-off-by: Andre Kurait <[email protected]> * Fix tempCompressedFilePattern Signed-off-by: Mikayla Thompson <[email protected]> * Revert "Support log config from a specified file" This reverts commit 54d5c46. Signed-off-by: Mikayla Thompson <[email protected]> --------- Signed-off-by: Mikayla Thompson <[email protected]> Signed-off-by: Andre Kurait <[email protected]> Co-authored-by: Andre Kurait <[email protected]>
1 parent 089fc76 commit 8155c04

File tree

1 file changed

+70
-33
lines changed

1 file changed

+70
-33
lines changed

‎TrafficCapture/trafficReplayer/src/main/resources/log4j2.properties

+70-33
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
status = warn
22

3-
property.logsDir = ${env:SHARED_LOGS_DIR_PATH:-./logs}
4-
property.tuplesFileNamePrefix = ${logsDir}/${hostName}/tuples/tuples
3+
property.rootLogsDir = ${env:SHARED_LOGS_DIR_PATH:-./logs}
4+
property.logFileNamePrefix = ${rootLogsDir}/${hostName}
5+
property.tempDir = ./logs/temp
56

67
appenders = console, ReplayerLogFile, OUTPUT_TUPLES, TRANSACTION_SUMMARIES, TRANSACTION_SUMMARIES_LOGFILE, ALL_ACTIVE_WORK_MONITOR_LOGFILE
78

@@ -14,28 +15,47 @@ appender.console.direct = true
1415

1516
appender.ReplayerLogFile.type = RollingRandomAccessFile
1617
appender.ReplayerLogFile.name = ReplayerLogFile
17-
appender.ReplayerLogFile.fileName = logs/replayer.log
18-
appender.ReplayerLogFile.filePattern = logs/%d{yyyy-MM}{UTC}/replayer-%d{yyyy-MM-dd-HH-mm}{UTC}-%i.log.gz
18+
appender.ReplayerLogFile.fileName = ${tempDir}/logs/replayer.log
19+
appender.ReplayerLogFile.filePattern = ${logFileNamePrefix}/logs/replayer-%d{yyyy-MM-dd-HH-mm}{UTC}-%03i.log.gz
1920
appender.ReplayerLogFile.layout.type = PatternLayout
2021
appender.ReplayerLogFile.layout.pattern = [%-5level] %d{DEFAULT_MICROS}{UTC} [%t] %c{1} - %msg%equals{ ctx=%mdc}{ ctx={}}{}%n
21-
appender.ReplayerLogFile.policies.type = Policies
22-
appender.ReplayerLogFile.policies.time.type = TimeBasedTriggeringPolicy
23-
appender.ReplayerLogFile.policies.time.interval = 60
24-
appender.ReplayerLogFile.policies.time.modulate = true
25-
appender.ReplayerLogFile.strategy.type = DefaultRolloverStrategy
26-
appender.ReplayerLogFile.strategy.max = 288
22+
appender.ReplayerLogFile.policies.type=Policies
23+
# Make a new file once per minute
24+
appender.ReplayerLogFile.policies.time.type=TimeBasedTriggeringPolicy
25+
appender.ReplayerLogFile.policies.time.interval=1
26+
appender.ReplayerLogFile.policies.time.modulate=true
27+
# Make a new file if size is over 1GB
28+
appender.ReplayerLogFile.policies.size.type=SizeBasedTriggeringPolicy
29+
appender.ReplayerLogFile.policies.size.size=1GB
30+
# Make a new file on startup
31+
appender.ReplayerLogFile.policies.startup.type=OnStartupTriggeringPolicy
32+
appender.ReplayerLogFile.strategy.type=DefaultRolloverStrategy
33+
appender.ReplayerLogFile.strategy.fileIndex=nomax
34+
appender.ReplayerLogFile.strategy.tempCompressedFilePattern = ${logFileNamePrefix}/logs/replayer-%d{yyyy-MM-dd-HH-mm}{UTC}-%03i.log.gz.tmp
35+
appender.ReplayerLogFile.strategy.compressionLevel = 7
2736
appender.ReplayerLogFile.immediateFlush = false
2837

38+
2939
appender.OUTPUT_TUPLES.type = RollingRandomAccessFile
3040
appender.OUTPUT_TUPLES.name = OUTPUT_TUPLES
31-
appender.OUTPUT_TUPLES.fileName = ${tuplesFileNamePrefix}.log
32-
appender.OUTPUT_TUPLES.filePattern = ${tuplesFileNamePrefix}-%d{yyyy-MM-dd-HH-mm}{UTC}-%i.log.gz
41+
appender.OUTPUT_TUPLES.fileName = ${tempDir}/progress/tuples.log
42+
appender.OUTPUT_TUPLES.filePattern = ${logFileNamePrefix}/tuples/tuples-%d{yyyy-MM-dd-HH-mm}{UTC}-%03i.log.gz
3343
appender.OUTPUT_TUPLES.layout.type = PatternLayout
3444
appender.OUTPUT_TUPLES.layout.pattern = %m%n
35-
appender.OUTPUT_TUPLES.policies.type = Policies
36-
appender.OUTPUT_TUPLES.policies.size.type = SizeBasedTriggeringPolicy
37-
appender.OUTPUT_TUPLES.policies.size.size = 10 MB
38-
appender.OUTPUT_TUPLES.strategy.type = DefaultRolloverStrategy
45+
appender.OUTPUT_TUPLES.policies.type=Policies
46+
# Make a new file once per minute
47+
appender.OUTPUT_TUPLES.policies.time.type=TimeBasedTriggeringPolicy
48+
appender.OUTPUT_TUPLES.policies.time.interval=1
49+
appender.OUTPUT_TUPLES.policies.time.modulate=true
50+
# Make a new file if size is over 1GB
51+
appender.OUTPUT_TUPLES.policies.size.type=SizeBasedTriggeringPolicy
52+
appender.OUTPUT_TUPLES.policies.size.size=1GB
53+
# Make a new file on startup
54+
appender.OUTPUT_TUPLES.policies.startup.type=OnStartupTriggeringPolicy
55+
appender.OUTPUT_TUPLES.strategy.type=DefaultRolloverStrategy
56+
appender.OUTPUT_TUPLES.strategy.fileIndex=nomax
57+
appender.OUTPUT_TUPLES.strategy.tempCompressedFilePattern = ${logFileNamePrefix}/tuples/tuples-%d{yyyy-MM-dd-HH-mm}{UTC}-%03i.log.gz.tmp
58+
appender.OUTPUT_TUPLES.strategy.compressionLevel = 7
3959
appender.OUTPUT_TUPLES.immediateFlush = false
4060

4161
appender.TRANSACTION_SUMMARIES.type = Console
@@ -47,30 +67,46 @@ appender.TRANSACTION_SUMMARIES.direct = true
4767

4868
appender.TRANSACTION_SUMMARIES_LOGFILE.type = RollingRandomAccessFile
4969
appender.TRANSACTION_SUMMARIES_LOGFILE.name = TransactionSummariesFile
50-
appender.TRANSACTION_SUMMARIES_LOGFILE.fileName = logs/progress.log
51-
appender.TRANSACTION_SUMMARIES_LOGFILE.filePattern = logs/%d{yyyy-MM}{UTC}/progress-%d{yyyy-MM-dd-HH-mm}{UTC}-%i.log.gz
70+
appender.TRANSACTION_SUMMARIES_LOGFILE.fileName = ${tempDir}/progress/progress.log
71+
appender.TRANSACTION_SUMMARIES_LOGFILE.filePattern = ${logFileNamePrefix}/progress/progress-%d{yyyy-MM-dd-HH-mm}{UTC}-%03i.log.gz
5272
appender.TRANSACTION_SUMMARIES_LOGFILE.layout.type = PatternLayout
5373
appender.TRANSACTION_SUMMARIES_LOGFILE.layout.pattern = %d{yyyy-MM-dd HH:mm:ss,SSS}{UTC}: %msg%n
54-
appender.TRANSACTION_SUMMARIES_LOGFILE.policies.type = Policies
55-
appender.TRANSACTION_SUMMARIES_LOGFILE.policies.time.type = TimeBasedTriggeringPolicy
56-
appender.TRANSACTION_SUMMARIES_LOGFILE.policies.time.interval = 60
57-
appender.TRANSACTION_SUMMARIES_LOGFILE.policies.time.modulate = true
58-
appender.TRANSACTION_SUMMARIES_LOGFILE.strategy.type = DefaultRolloverStrategy
59-
appender.TRANSACTION_SUMMARIES_LOGFILE.strategy.max = 720
74+
appender.TRANSACTION_SUMMARIES_LOGFILE.policies.type=Policies
75+
# Make a new file once per minute
76+
appender.TRANSACTION_SUMMARIES_LOGFILE.policies.time.type=TimeBasedTriggeringPolicy
77+
appender.TRANSACTION_SUMMARIES_LOGFILE.policies.time.interval=1
78+
appender.TRANSACTION_SUMMARIES_LOGFILE.policies.time.modulate=true
79+
# Make a new file if size is over 100MB
80+
appender.TRANSACTION_SUMMARIES_LOGFILE.policies.size.type=SizeBasedTriggeringPolicy
81+
appender.TRANSACTION_SUMMARIES_LOGFILE.policies.size.size=100MB
82+
# Make a new file on startup
83+
appender.TRANSACTION_SUMMARIES_LOGFILE.policies.startup.type=OnStartupTriggeringPolicy
84+
appender.TRANSACTION_SUMMARIES_LOGFILE.strategy.type=DefaultRolloverStrategy
85+
appender.TRANSACTION_SUMMARIES_LOGFILE.strategy.fileIndex=nomax
86+
appender.TRANSACTION_SUMMARIES_LOGFILE.strategy.tempCompressedFilePattern = ${logFileNamePrefix}/progress/progress-%d{yyyy-MM-dd-HH-mm}{UTC}-%03i.log.tmp
87+
appender.TRANSACTION_SUMMARIES_LOGFILE.strategy.compressionLevel = 7
6088
appender.TRANSACTION_SUMMARIES_LOGFILE.immediateFlush = false
6189

6290
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.type = RollingRandomAccessFile
6391
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.name = AllActiveWorkMonitorFile
64-
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.fileName = logs/longRunningActivity.log
65-
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.filePattern = logs/%d{yyyy-MM}{UTC}/longRunningActivity-%d{yyyy-MM-dd-HH-mm}{UTC}-%i.log.gz
92+
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.fileName = ${tempDir}/longRunningActivity/longRunningActivity.log
93+
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.filePattern = ${logFileNamePrefix}/longRunningActivity/longRunningActivity-%d{yyyy-MM-dd-HH-mm}{UTC}-%03i.log.gz
6694
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.layout.type = PatternLayout
6795
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.layout.pattern = %msg%n
68-
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.policies.type = Policies
69-
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.policies.time.type = TimeBasedTriggeringPolicy
70-
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.policies.time.interval = 60
71-
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.policies.time.modulate = true
72-
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.strategy.type = DefaultRolloverStrategy
73-
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.strategy.max = 4
96+
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.policies.type=Policies
97+
# Make a new file once per minute
98+
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.policies.time.type=TimeBasedTriggeringPolicy
99+
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.policies.time.interval=1
100+
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.policies.time.modulate=true
101+
# Make a new file if size is over 100MB
102+
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.policies.size.type=SizeBasedTriggeringPolicy
103+
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.policies.size.size=100MB
104+
# Make a new file on startup
105+
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.policies.startup.type=OnStartupTriggeringPolicy
106+
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.strategy.type=DefaultRolloverStrategy
107+
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.strategy.fileIndex=nomax
108+
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.strategy.tempCompressedFilePattern = ${logFileNamePrefix}/longRunningActivity/longRunningActivity-%d{yyyy-MM-dd-HH-mm}{UTC}-%03i.log.tmp
109+
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.strategy.compressionLevel = 7
74110
appender.ALL_ACTIVE_WORK_MONITOR_LOGFILE.immediateFlush = false
75111

76112
rootLogger.level = info
@@ -85,8 +121,9 @@ logger.OutputTupleJsonLogger.appenderRef.OUTPUT_TUPLES.ref = OUTPUT_TUPLES
85121
logger.TransactionSummaryLogger.name = TransactionSummaryLogger
86122
logger.TransactionSummaryLogger.level = info
87123
logger.TransactionSummaryLogger.additivity = false
88-
#logger.TransactionSummaryLogger.appenderRef.TRANSACTION_SUMMARIES.ref = TransactionSummariesConsole
89124
logger.TransactionSummaryLogger.appenderRef.TRANSACTION_SUMMARIES_LOGFILE.ref = TransactionSummariesFile
125+
# Uncomment to enable progress logs by console output
126+
#logger.TransactionSummaryLogger.appenderRef.TRANSACTION_SUMMARIES.ref = TransactionSummariesConsole
90127

91128
logger.AllActiveWorkMonitor.name = AllActiveWorkMonitor
92129
logger.AllActiveWorkMonitor.level = info

0 commit comments

Comments
 (0)