Merge pull request #7560 from corda/merge-release/os/4.10-release/os/4.11-2023-11-03-8

ENT-10760: Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-11-03
This commit is contained in:
Adel El-Beik 2023-11-03 21:35:59 +00:00 committed by GitHub
commit 517dbf118e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -135,7 +135,7 @@
<DefaultRolloverStrategy min="1" max="100"> <DefaultRolloverStrategy min="1" max="100">
<Delete basePath="${archive}" maxDepth="1"> <Delete basePath="${archive}" maxDepth="1">
<IfFileName glob="${log-name}*.log.gz"/> <IfFileName glob="${diagnostic-log-name}*.log.gz"/>
<IfLastModified age="60d"> <IfLastModified age="60d">
<IfAny> <IfAny>
<IfAccumulatedFileSize exceeds="10 GB"/> <IfAccumulatedFileSize exceeds="10 GB"/>
@ -159,7 +159,7 @@
<DefaultRolloverStrategy min="1" max="100"> <DefaultRolloverStrategy min="1" max="100">
<Delete basePath="${archive}" maxDepth="1"> <Delete basePath="${archive}" maxDepth="1">
<IfFileName glob="${log-name}*.log.gz"/> <IfFileName glob="checkpoints_agent*.log.gz"/>
<IfLastModified age="60d"> <IfLastModified age="60d">
<IfAny> <IfAny>
<IfAccumulatedFileSize exceeds="10 GB"/> <IfAccumulatedFileSize exceeds="10 GB"/>