Merge lp:~3v1n0/bamf/upstart-support into lp:bamf

[Marco Trevisan (Treviño)]

BamfDaemon: add upstart session support

[lp:~3v1n0/bamf/upstart-support]

649. By Marco Trevisan (Treviño) on 2015-11-06

BamfDaemon: add upstart support

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:649
http://jenkins.qa.ubuntu.com/job/bamf-ci/119/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-wily-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-wily-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/bamf-wily-armhf-ci/4/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/bamf-ci/119/rebuild

review: Approve (continuous-integration)

[lp:~3v1n0/bamf/upstart-support]

650. By Marco Trevisan (Treviño) on 2015-11-19

data: add bamfdaemon-dbus-runner, to run the daemon using upstart if possible

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:650
http://jenkins.qa.ubuntu.com/job/bamf-ci/120/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-xenial-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-xenial-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/bamf-xenial-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/bamf-ci/120/rebuild

review: Approve (continuous-integration)

[lp:~3v1n0/bamf/upstart-support]

651. By Marco Trevisan (Treviño) on 2015-11-19

bamfdaemon: make start/stop depending on hud and unity-panel-service

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:651
http://jenkins.qa.ubuntu.com/job/bamf-ci/121/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-xenial-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-xenial-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/bamf-xenial-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/bamf-ci/121/rebuild

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

Nice.

review: Approve

[Martin Pitt (pitti)]

This adds quite a lot of complexity and potential for brittleness. You already had a followup fix for bamfdaemon-dbus-runner.in, having this redirector is quite ugly, and it assumes that the start condition

  start on (starting hud or starting unity-panel-service or starting unity7)

is correct and complete for all times. I. e. if someone tries to use bamf under Ubuntu GNOME, you will get 25s D-Bus timeouts.

D-Bus activation starts up the service *exactly* when and if it's needed, provides automatic restarts, and avoids all of this.

What was the rationale for this? It would be nice if commit logs would explain the "why", not (just) the "what". Thanks!

[Martin Pitt (pitti)]

To be precise, I think we should drop data/bamfdaemon-dbus-runner.in and data/bamfdaemon.conf.in completely.

[Marco Trevisan (Treviño) (3v1n0)]

As explained in IRC, my POV was to ensure bamf is running with the same environment variables we had in unity, plus ensuring it to be respawn when killed or crashed, without having to directly call a dbus method (that for the way libbamf is done, might happen late, or only on user actions).

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2015-11-19 10:23:37 +0000
+++ data/Makefile.am	2015-11-19 10:23:38 +0000
@@ -4,14 +4,22 @@
 upstartdir = @datarootdir@/upstart/sessions
 upstart_DATA = bamfdaemon.conf
 
+bamfdaemondbusrunnerdir = $(pkglibexecdir)
+bamfdaemondbusrunner_SCRIPTS = bamfdaemon-dbus-runner
+
 org.ayatana.bamf.service: org.ayatana.bamf.service.in
 	$(AM_V_GEN)sed "s,@PKGLIBEXECDIR@,$(pkglibexecdir)," $< > $@
 
 bamfdaemon.conf: bamfdaemon.conf.in
 	$(AM_V_GEN)sed "s,@PKGLIBEXECDIR@,$(pkglibexecdir)," $< > $@
 
+bamfdaemon-dbus-runner: bamfdaemon-dbus-runner.in
+	$(AM_V_GEN)sed "s,@PKGLIBEXECDIR@,$(pkglibexecdir)," $< > $@
+
 EXTRA_DIST = org.ayatana.bamf.service.in \
-             bamfdaemon.conf.in
+             bamfdaemon.conf.in \
+             bamfdaemon-dbus-runner.in
 
 CLEANFILES = org.ayatana.bamf.service \
-             bamfdaemon.conf
+             bamfdaemon.conf \
+             bamfdaemon-dbus-runner

=== added file 'data/bamfdaemon-dbus-runner.in'
--- data/bamfdaemon-dbus-runner.in	1970-01-01 00:00:00 +0000
+++ data/bamfdaemon-dbus-runner.in	2015-11-19 10:23:38 +0000
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ -n "$UPSTART_SESSION" ]; then
+  /sbin/initctl start bamfdaemon
+else
+  @PKGLIBEXECDIR@/bamfdaemon
+fi

=== modified file 'data/bamfdaemon.conf.in'
--- data/bamfdaemon.conf.in	2015-11-19 10:23:37 +0000
+++ data/bamfdaemon.conf.in	2015-11-19 10:23:38 +0000
@@ -1,8 +1,8 @@
 description "BAMF Application Matcher Framework"
 author "Marco Trevisan <[e-mail]>"
 
-start on starting unity7
-stop on stopped unity7
+start on (starting hud or starting unity-panel-service or starting unity7)
+stop on (stopped hud and stopped unity-panel-service and stopped unity7)
 
 respawn
 exec @PKGLIBEXECDIR@/bamfdaemon

=== modified file 'data/org.ayatana.bamf.service.in'
--- data/org.ayatana.bamf.service.in	2012-11-07 19:51:56 +0000
+++ data/org.ayatana.bamf.service.in	2015-11-19 10:23:38 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.ayatana.bamf
-Exec=@PKGLIBEXECDIR@/bamfdaemon
+Exec=@PKGLIBEXECDIR@/bamfdaemon-dbus-runner