From e9e8fa5c7cd0e1cf9e8d468a9fd9b0b08d7d004c Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@isti.cnr.it>
Date: Tue, 12 Sep 2017 18:25:43 +0200
Subject: [PATCH] Fix the logback template when we use the
 SizeAndTimeBasedRollingPolicy, see https://support.d4science.org/issues/9576

---
 smartgears/smartgears/templates/logback.xml.j2 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/smartgears/smartgears/templates/logback.xml.j2 b/smartgears/smartgears/templates/logback.xml.j2
index a6d4187d..f6c0a545 100644
--- a/smartgears/smartgears/templates/logback.xml.j2
+++ b/smartgears/smartgears/templates/logback.xml.j2
@@ -7,7 +7,7 @@
     </encoder>
 {% if smartgears_log_use_timesize_appender %}
     <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-      <fileNamePattern>{{ smartgears_log_dir }}/ghn.%d{yyyy-MM-dd}.log</fileNamePattern>
+      <fileNamePattern>{{ smartgears_log_dir }}/ghn.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
       <maxHistory>{{ smartgears_log_max_history }}</maxHistory>
       <maxFileSize>{{ smartgears_log_max_file_size }}</maxFileSize>
       <totalSizeCap>{{ smartgears_log_total_file_cap }}</totalSizeCap>
@@ -28,7 +28,7 @@
     </encoder>
 {% if smartgears_log_use_timesize_appender %}
     <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-      <fileNamePattern>{{ smartgears_log_dir }}/accounting.%d{yyyy-MM-dd}.log</fileNamePattern>
+      <fileNamePattern>{{ smartgears_log_dir }}/accounting.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
       <maxHistory>{{ smartgears_log_max_history }}</maxHistory>
       <maxFileSize>{{ smartgears_log_max_file_size }}</maxFileSize>
       <totalSizeCap>{{ smartgears_log_total_file_cap }}</totalSizeCap>
@@ -49,7 +49,7 @@
     </encoder>
 {% if smartgears_log_use_timesize_appender %}
     <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-      <fileNamePattern>{{ smartgears_log_dir }}/access.%d{yyyy-MM-dd}.log</fileNamePattern>
+      <fileNamePattern>{{ smartgears_log_dir }}/access.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
       <maxHistory>{{ smartgears_log_max_history }}</maxHistory>
       <maxFileSize>{{ smartgears_log_max_file_size }}</maxFileSize>
       <totalSizeCap>{{ smartgears_log_total_file_cap }}</totalSizeCap>
@@ -71,7 +71,7 @@
     </encoder>
 {% if smartgears_log_use_timesize_appender %}
     <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-      <fileNamePattern>{{ smartgears_log_dir }}/analysis.%d{yyyy-MM-dd}.log</fileNamePattern>
+      <fileNamePattern>{{ smartgears_log_dir }}/analysis.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
       <maxHistory>{{ smartgears_log_max_history }}</maxHistory>
       <maxFileSize>{{ smartgears_log_max_file_size }}</maxFileSize>
       <totalSizeCap>{{ smartgears_log_total_file_cap }}</totalSizeCap>