Add a size based roll over of artemis and audit log files

ansible-middleware · Jan 16, 2025 · d6f4d13 · d6f4d13
1 parent ff73ae0
commit d6f4d13
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 4 deletions.
diff --git a/molecule/mask_passwords/converge.yml b/molecule/mask_passwords/converge.yml
@@ -24,6 +24,8 @@
     activemq_auth_ldap_role_search_subtree: True
     activemq_global_max_size: 128MB
     activemq_cors_strict_checking: False
+    activemq_logger_max_file_size: 100MB
+    activemq_logger_audit_max_file_size: 50MB
     activemq_users:
       - user: amq
         password: amqbrokerpass

diff --git a/molecule/mask_passwords/templates/logging/custom.log4j2.properties.j2 b/molecule/mask_passwords/templates/logging/custom.log4j2.properties.j2
@@ -86,6 +86,8 @@ appender.log_file.policies.type = Policies
 appender.log_file.policies.cron.type = CronTriggeringPolicy
 appender.log_file.policies.cron.schedule = 0 0 0 * * ?
 appender.log_file.policies.cron.evaluateOnStartup = true
+appender.log_file.policies.size.type = SizeBasedTriggeringPolicy
+appender.log_file.policies.size.size = {{ activemq_logger_max_file_size }}
 appender.log_file.strategy.type=DefaultRolloverStrategy
 appender.log_file.strategy.max={{ activemq_logger_rollover_files }}
 
@@ -100,5 +102,7 @@ appender.audit_log_file.policies.type = Policies
 appender.audit_log_file.policies.cron.type = CronTriggeringPolicy
 appender.audit_log_file.policies.cron.schedule = 0 0 0 * * ?
 appender.audit_log_file.policies.cron.evaluateOnStartup = true
+appender.audit_log_file.policies.size.type = SizeBasedTriggeringPolicy
+appender.audit_log_file.policies.size.size = {{ activemq_logger_audit_max_file_size }}
 appender.audit_log_file.strategy.type=DefaultRolloverStrategy
 appender.audit_log_file.strategy.max={{ activemq_logger_audit_rollover_files }}
diff --git a/roles/activemq/defaults/main.yml b/roles/activemq/defaults/main.yml
@@ -241,6 +241,8 @@ activemq_logger_config_keep_name: false
 activemq_logger_rollover_files: 5
 activemq_logger_audit_rollover_files: 5
 activemq_logger_filepath: /log/artemis.log
+activemq_logger_max_file_size: 100MB
+activemq_logger_audit_max_file_size: 50MB
 
 # Metrics
 activemq_jmx_exporter_port: 18080

diff --git a/roles/activemq/meta/argument_specs.yml b/roles/activemq/meta/argument_specs.yml
@@ -916,6 +916,14 @@ argument_specs:
                 default: "{{ activemq_port }}"
                 type: 'int'
                 description: "The port number to wait for when activemq_systemd_wait_for_port is true"
+            activemq_logger_max_file_size:
+                description: "Maximum size of each regular log file before rollover"
+                default: "100MB"
+                type: "str"
+            activemq_logger_audit_max_file_size:
+                description: "Maximum size of each audit log file before rollover"
+                default: "50MB"
+                type: "str"
     downstream:
         options:
             amq_broker_version:

diff --git a/roles/activemq/templates/log4j2.properties.j2 b/roles/activemq/templates/log4j2.properties.j2
@@ -85,8 +85,10 @@ appender.log_file.policies.type = Policies
 appender.log_file.policies.cron.type = CronTriggeringPolicy
 appender.log_file.policies.cron.schedule = 0 0 0 * * ?
 appender.log_file.policies.cron.evaluateOnStartup = true
-appender.log_file.strategy.type=DefaultRolloverStrategy
-appender.log_file.strategy.max={{ activemq_logger_rollover_files }}
+appender.log_file.policies.size.type = SizeBasedTriggeringPolicy
+appender.log_file.policies.size.size = {{ activemq_logger_max_file_size }}
+appender.log_file.strategy.type = DefaultRolloverStrategy
+appender.log_file.strategy.max = {{ activemq_logger_rollover_files }}
 
 # Audit log file appender
 appender.audit_log_file.type = RollingFile
@@ -99,5 +101,7 @@ appender.audit_log_file.policies.type = Policies
 appender.audit_log_file.policies.cron.type = CronTriggeringPolicy
 appender.audit_log_file.policies.cron.schedule = 0 0 0 * * ?
 appender.audit_log_file.policies.cron.evaluateOnStartup = true
-appender.audit_log_file.strategy.type=DefaultRolloverStrategy
-appender.audit_log_file.strategy.max={{ activemq_logger_audit_rollover_files }}
+appender.audit_log_file.policies.size.type = SizeBasedTriggeringPolicy
+appender.audit_log_file.policies.size.size = {{ activemq_logger_audit_max_file_size }}
+appender.audit_log_file.strategy.type = DefaultRolloverStrategy
+appender.audit_log_file.strategy.max = {{ activemq_logger_audit_rollover_files }}