(PDB-3077) Include file size based rotation and disable logrotate

This commit adds file-size based rotation to the main puppetdb and puppetdb access log files and disables the use of logrotate for rotation during ezbake package builds.
puppetlabs · Oct 25, 2016 · bc15789 · bc15789
1 parent 4fa19f4
commit bc15789
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/project.clj b/project.clj
@@ -111,7 +111,8 @@
                        :group "puppetdb"
                        :build-type "foss"
                        :main-namespace "puppetlabs.puppetdb.main"
-                       :repo-target "PC1"}
+                       :repo-target "PC1"
+                       :logrotate-enabled false}
                 :config-dir "ext/config/foss"
                 }
 

diff --git a/resources/ext/config/logback.xml b/resources/ext/config/logback.xml
@@ -7,10 +7,13 @@
 
     <appender name="F1" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>/var/log/puppetlabs/puppetdb/puppetdb.log</file>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>/var/log/puppetlabs/puppetdb/puppetdb-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
+        <append>true</append>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>/var/log/puppetlabs/puppetdb/puppetdb-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <!-- each file should be at most 10MB, keep 90 days worth of history, but at most 1GB total-->
+            <maxFileSize>10MB</maxFileSize>
             <maxHistory>90</maxHistory>
+            <totalSizeCap>1GB</totalSizeCap>
         </rollingPolicy>
         <encoder>
             <pattern>%d %-5p [%c{2}] %m%n</pattern>

diff --git a/resources/ext/config/request-logging.xml b/resources/ext/config/request-logging.xml
@@ -1,6 +1,14 @@
 <configuration debug="false">
-    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>/var/log/puppetlabs/puppetdb/puppetdb-access.log</file>
+        <append>true</append>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>/var/log/puppetlabs/puppetdb/puppetdb-access-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <!-- each file should be at most 10MB, keep 90 days worth of history, but at most 1GB total-->
+            <maxFileSize>10MB</maxFileSize>
+            <maxHistory>90</maxHistory>
+            <totalSizeCap>1GB</totalSizeCap>
+        </rollingPolicy>
         <encoder>
             <pattern>%h %l %u [%t] "%r" %s %b "%i{Referer}" "%i{User-Agent}" %D</pattern>
         </encoder>