Merge lp:~kim0/logrotate/bug-730504 into lp:ubuntu/natty/logrotate

[Ahmed Kamal]

Patch to allow for cleaning up non-existent files from logrotate status file.
An accident had caused one million logfiles to be created on my machine, and that was causing logrotate to use 100% cpu for long times. Apparently upstream logrotate does not offer any facility to do that

[lp:~kim0/logrotate/bug-730504]

17. By Ahmed Kamal on 2011-03-12

sed stripping quotes from filenames, overwriting status.clean

[Dave Walker (davewalker)]

Thanks for making them fixes. With this, approved and uploading. Submitting to Debian.

Good catch!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-14 19:34:54 +0000
+++ debian/changelog	2011-03-12 20:22:14 +0000
@@ -1,3 +1,10 @@
+logrotate (3.7.8-6ubuntu2) natty; urgency=low
+
+  * cron.daily: Added ability to clean non existent log files from 
+    logrotate status file (LP: #730504)
+
+ -- Ahmed Kamal <[e-mail]>  Sat, 12 Mar 2011 14:58:38 +0200
+
 logrotate (3.7.8-6ubuntu1) maverick; urgency=low
 
   * Merge from debian unstable (LP: #554823), remaining changes:

=== modified file 'debian/cron.daily'
--- debian/cron.daily	2004-06-11 13:51:34 +0000
+++ debian/cron.daily	2011-03-12 20:22:14 +0000
@@ -1,4 +1,13 @@
 #!/bin/sh
 
+# Clean non existent log file entries from status file
+cd /var/lib/logrotate
+head -1 status > status.clean
+while read logfile date
+do
+    [ -e "$logfile" ] && echo "\"$logfile\" $date"
+done < < <(sed 's/"//g' status) >> status.clean
+mv status.clean status
+
 test -x /usr/sbin/logrotate || exit 0
 /usr/sbin/logrotate /etc/logrotate.conf