Merge lp:~xnox/ubuntu/vivid/upstart/fix-rotate-logs into lp:ubuntu/vivid/upstart

[Dimitri John Ledkov]

[Martin Pitt (pitti)]

Looks good to me, thanks!

review: Approve

[Martin Pitt (pitti)]

BTW, how does emitting ":sys:*" events go along with https://code.launchpad.net/~xnox/upstart/no-classes/+merge/245948 ? I thought they should drop the :sys prefix now?

review: Needs Information

[Dimitri John Ledkov (xnox)]

@pitti:
I'm going for a mix here.
udev-bridge is moving from system-init -> session-init, thus dropping :sys: prefix.
local-bridge will stay running under system-init (either systemd or upstart), thus will keep :sys: prefix
rotate-logs emitage moved from system-init -> session-init, thus dropps :sys: prefix.

=== modified file 'debian/changelog'
--- debian/changelog	2014-11-29 11:39:41 +0000
+++ debian/changelog	2015-01-11 01:30:11 +0000
@@ -1,3 +1,14 @@
+upstart (1.13.2-0ubuntu6) UNRELEASED; urgency=medium
+
+  * debian/upstart-bin.upstart.cron.daily: Emit ":sys:rotate-logs" event
+    direct into session init, by-passing system upstart & session
+    event-bridge. This way session logs will be rotated, even upstart is
+    not system init.
+  * debian/control: make upstart-monitor & upstart-dconf-bridge be
+    installable with just session init, upstart-bin.
+
+ -- Dimitri John Ledkov <[e-mail]>  Sun, 11 Jan 2015 01:15:34 +0000
+
 upstart (1.13.2-0ubuntu5) vivid; urgency=medium
 
   * debian/xsession.d/99upstart: Add support for GNOME Flashback

=== modified file 'debian/control'
--- debian/control	2014-11-20 06:57:48 +0000
+++ debian/control	2015-01-11 01:30:11 +0000
@@ -48,7 +48,7 @@
 Architecture: all
 Section: utils
 Priority: optional
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, upstart (>= 1.7), python3-dbus
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, upstart-bin (>= 1.7), python3-dbus
 Recommends: python3-gi
 Description: event monitor for upstart
  This package contains a utility that may be run both as a
@@ -60,7 +60,7 @@
 Architecture: any
 Section: utils
 Priority: optional
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, upstart (>= 1.10)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, upstart-bin (>= 1.10)
 Description: DConf bridge for upstart
  This package contains a bridge that allows upstart jobs to react when
  DConf/gsettings keys are changed.

=== modified file 'debian/upstart-bin.upstart.cron.daily'
--- debian/upstart-bin.upstart.cron.daily	2014-09-30 08:58:51 +0000
+++ debian/upstart-bin.upstart.cron.daily	2015-01-11 01:30:11 +0000
@@ -1,11 +1,18 @@
 #!/bin/sh
-# 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.
+
+# For each Upstart Session Init, emit ":sys:rotate-logs" events, requesting
+# that the# session Inits rotate their logs. There is no user-daily
+# cron.
+#
+# Doing it this way does not rely on System Upstart, nor
+# upstart-event-bridge(8) running in the Session Init.
 #
 # Note that system-level Upstart logs are handled separately using a
 # logrotate script.
 
-/sbin/initctl version >/dev/null 2>&1 || exit 0
+[ -x /sbin/initctl ] || exit 0
 
-/sbin/initctl emit rotate-logs
+for session in /run/user/*/upstart/sessions/*
+do
+    env $(cat $session) /sbin/initctl emit :sys:rotate-logs >/dev/null 2>&1 || true
+done