Merge pull request #8313 from alphagov/barrucadu-patch-1

Only keep one hour of old CDN logs
alphagov · Nov 7, 2018 · f98ab3b · f98ab3b
2 parents ee4dbbb + cd708f4
commit f98ab3b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/modules/govuk_cdnlogs/spec/classes/govuk_cdnlogs_spec.rb b/modules/govuk_cdnlogs/spec/classes/govuk_cdnlogs_spec.rb
@@ -103,7 +103,7 @@
       it 'should rotate the giraffe logs hourly' do
         is_expected.to contain_file('/etc/logrotate.cdn_logs_hourly.conf')
           .with_content(%r{^/tmp/logs/cdn-giraffe\.log$})
-          .with_content(/rotate 3/)
+          .with_content(/rotate 1/)
       end
 
       it 'should rotate the elephant logs hourly' do

diff --git a/modules/govuk_cdnlogs/templates/etc/logrotate.cdn_logs_hourly.conf.erb b/modules/govuk_cdnlogs/templates/etc/logrotate.cdn_logs_hourly.conf.erb
@@ -8,7 +8,7 @@ to_rotate_hourly.map { |name| "#{ @log_dir }/cdn-#{ name }.log" }.join("\n")
 
 {
   su root deploy
-  rotate 3
+  rotate 1
   dateext
   dateformat -%Y%m%d-%s
   compress