Merge pull request #233 from RanabirChakraborty/systemd_fix

Fix systemd configuration when absolute logfile paths are used

Author: guidograzioli

molecule/mask_passwords/prepare.yml

@@ -1,18 +1,6 @@
 ---
 - name: Prepare
   hosts: all
-  vars:
-    activemq_audit_log_absolute_path: "/var/log/amq/audit.log"
-    activemq_main_log_absolute_path: "/var/log/amq/artemis.log"
   tasks:
-    - name: Ensure the audit log directory exists
-      ansible.builtin.file:
-        path: "{{ activemq_main_log_absolute_path }}"
-        state: directory
-        owner: root
-        group: root
-        mode: '0755'
-      when: activemq_main_log_absolute_path | default('') | length > 0
-
     - name: "Run preparation common to all scenario"
       ansible.builtin.include_tasks: ../prepare.yml

roles/activemq/tasks/systemd.yml

@@ -14,16 +14,6 @@
         group: root
         mode: '0755'
 
-    - name: Ensure the audit log directory exists
-      ansible.builtin.file:
-        path: "{{ activemq_audit_log_absolute_path }}"
-        state: directory
-        owner: root
-        group: root
-        mode: '0755'
-      become: "{{ activemq_install_requires_become | default(true) }}"
-      when: activemq_audit_log_absolute_path | default('') | length > 0
-
     - name: "Configure sysconfig file for {{ activemq.instance_name }} {{ activemq.service_name }} service"
       ansible.builtin.template:
         src: amq_broker.sysconfig.j2

roles/activemq/templates/amq_broker.service.j2

@@ -28,9 +28,9 @@ ExecStartPost=/usr/bin/timeout {{ activemq_systemd_wait_for_timeout }} sh -c 'wh
 {% endif %}
 {% if activemq_systemd_wait_for_log %}
 {% if activemq_ha_enabled %}
-ExecStartPost=/usr/bin/timeout {{ activemq_systemd_wait_for_timeout }} sh -c 'tail -n 15 -F {{ activemq.instance_home }}/log/artemis.log | sed "/{{ activemq_systemd_wait_for_log_ha_string }}/ q" && /bin/sleep {{ activemq_systemd_wait_for_delay }}'
+ExecStartPost=/usr/bin/timeout {{ activemq_systemd_wait_for_timeout }} sh -c 'tail -n 15 -F {{ activemq_main_log_absolute_path | default(activemq.instance_home ~ "/log/artemis.log", true) }} | sed "/{{ activemq_systemd_wait_for_log_ha_string }}/ q" && /bin/sleep {{ activemq_systemd_wait_for_delay }}'
 {% else %}
-ExecStartPost=/usr/bin/timeout {{ activemq_systemd_wait_for_timeout }} sh -c 'tail -n 15 -F {{ activemq.instance_home }}/log/artemis.log | sed "/{{ activemq_systemd_wait_for_log_string }}/ q" && /bin/sleep {{ activemq_systemd_wait_for_delay }}'
+ExecStartPost=/usr/bin/timeout {{ activemq_systemd_wait_for_timeout }} sh -c 'tail -n 15 -F {{ activemq_main_log_absolute_path | default(activemq.instance_home ~ "/log/artemis.log", true) }} | sed "/{{ activemq_systemd_wait_for_log_string }}/ q" && /bin/sleep {{ activemq_systemd_wait_for_delay }}'
 {% endif %}
 {% endif %}