Merge lp:~ted/indicator-sync/upstart-no-greeter into lp:indicator-sync

[Ted Gould]

Stop the Upstart job from running on the greeter

This is a little bit of a hack, but we're handling the error, and not putting too much time into it until we know more where it is going.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/35/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sync-trusty-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sync-trusty-armhf-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sync-ci/35/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

This is a little hacky, but I agree it's solving the problem.

To test, I locked the screen & went to the greeter and waited for 60 seconds. During that time, /var/lib/lightdm/.cache/upstart/indicator-sync.log grew by 264 lines.

In a second equivalent test, it grew by 235 lines.

In another equivalent test *after* applying this patch, it grew by 4 lines.

review: Approve

[Charles Kerr (charlesk)]

To be clear: in addition to this fix which solves the short-term issue in bug #1255719, this should also be solved properly for the non-libindicator items as well.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'data/indicator-sync.conf.in'
--- data/indicator-sync.conf.in	2013-08-27 20:49:49 +0000
+++ data/indicator-sync.conf.in	2013-12-03 11:12:04 +0000
@@ -5,4 +5,14 @@
 
 respawn
 
+# limit to two times in a five second period
+respawn limit 2 5
+
+pre-start script
+	# The sync indicator shouldn't be on the greeter
+	if [ "${USER}" = "lightdm" ]; then
+		stop
+	fi
+end script
+
 exec @pkglibexecdir@/indicator-sync-service