Merge lp:~jamesodhunt/ubuntu/trusty/upstart/periodic-logrotate-using-events into lp:ubuntu/trusty/upstart

[James Hunt]

Use events and cron hourly snippet to rotate Session Init logs.

[Dimitri John Ledkov (xnox)]

review: Approve (core-dev)

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-11 16:12:00 +0000
+++ debian/changelog	2014-03-25 10:07:29 +0000
@@ -1,3 +1,12 @@
+upstart (1.12.1-0ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/upstart.cron.hourly: hourly cron job to emit the 'rotate-logs'
+    event.
+  * debian/user-conf/logrotate.conf: Run 1 minute after session startup
+    and whenever the 'rotate-logs' event is emitted.
+
+ -- James Hunt <[e-mail]>  Tue, 25 Mar 2014 09:47:16 +0000
+
 upstart (1.12.1-0ubuntu1) trusty; urgency=medium
 
   [ Dimitri John Ledkov ]
 
=== added file 'debian/upstart.cron.hourly'
--- debian/upstart.cron.hourly	1970-01-01 00:00:00 +0000
+++ debian/upstart.cron.hourly	2014-03-25 10:07:29 +0000
@@ -0,0 +1,10 @@
+# Emit an Upstart system event, that will propagate to the Session Inits
+# via the upstart-event-bridge(8), requesting that the Session Inits
+# rotate their logs.
+#
+# Note that system-level Upstart logs are handled separately using a
+# logrotate script.
+
+[ -x /sbin/initctl ] || exit 0
+
+initctl emit rotate-logs
 
=== modified file 'debian/user-conf/logrotate.conf'
--- debian/user-conf/logrotate.conf	2013-09-26 14:09:41 +0000
+++ debian/user-conf/logrotate.conf	2014-03-25 10:07:29 +0000
@@ -7,11 +7,13 @@
 
 description "Rotate job log files"
 
-start on startup
+start on startup or :sys:rotate-logs
+
+task
 
 pre-start script
 
-logrotate=$(command -v logrotate)
+logrotate=$(command -v logrotate 2>/dev/null || :)
 
 # logrotate is not installed
 [ -z "$logrotate" ] && exit 0
@@ -27,7 +29,7 @@
 script
 
 # started by event, so allow time for main jobs to settle
-[ -n "$UPSTART_EVENTS" ] && sleep 60
+[ -n "$UPSTART_EVENTS" ] && [ "$UPSTART_EVENTS" = startup ] && sleep 60
 
 statedir=${XDG_CACHE_HOME:-$HOME/.cache}/logrotate
 statefile="$statedir/status"
@@ -41,7 +43,7 @@
 
 cat <<EOF >$conf
 "$logdir/*.log" {
-        daily
+        hourly
         missingok
         rotate 7
         compress