Merge lp:~lool/location-service/update-trust-store-job into lp:location-service/trunk

Proposed by Loïc Minier
Status: Merged
Approved by: Thomas Voß
Approved revision: 107
Merged at revision: 104
Proposed branch: lp:~lool/location-service/update-trust-store-job
Merge into: lp:location-service/trunk
Prerequisite: lp:~thomas-voss/location-service/add-testing-for-remote-provider
Diff against target: 34 lines (+17/-8)
1 file modified
data/ubuntu-location-service-trust-stored.conf.in (+17/-8)
To merge this branch: bzr merge lp:~lool/location-service/update-trust-store-job
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Thomas Voß (community) Approve
Review via email: mp+234726@code.launchpad.net

Commit message

Update upstart job start conditions; workaround startup issue with a sleep.

Description of the change

Update upstart job start conditions; workaround startup issue with a sleep.

To post a comment you must log in.
Revision history for this message
Thomas Voß (thomas-voss) wrote :

LGTM.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/ubuntu-location-service-trust-stored.conf.in'
2--- data/ubuntu-location-service-trust-stored.conf.in 2014-08-13 09:50:27 +0000
3+++ data/ubuntu-location-service-trust-stored.conf.in 2014-09-15 18:31:19 +0000
4@@ -1,13 +1,22 @@
5 description "Location Services Trust Store Daemon"
6
7-start on (started JOB=dbus and started JOB=unity8) and (:sys:started JOB=ubuntu-location-service)
8-stop on stopping JOB=dbus or (:sys:stopped JOB=ubuntu-location-service)
9+# try to start this on session startup or once ubuntu-location-service finished
10+# starting; if dbus is available and location-service isn't or vice-versa,
11+# startup will fail but the next event firing will trigger another start
12+start on (started dbus and xsession SESSION=ubuntu-touch) or \
13+ :sys:started JOB=ubuntu-location-service
14+stop on desktop-end or :sys:stopping JOB=ubuntu-location-service
15
16 respawn
17
18-exec /usr/bin/trust-stored-skeleton \
19- --remote-agent DBusRemoteAgent --bus=system \
20- --local-agent MirAgent \
21- --trusted-mir-socket=/var/run/user/$(id -u)/mir_socket_trusted \
22- --for-service UbuntuLocationService \
23- --store-bus session
24+script
25+ # XXX LP #1369692
26+ sleep 2
27+
28+ exec /usr/bin/trust-stored-skeleton \
29+ --remote-agent DBusRemoteAgent --bus=system \
30+ --local-agent MirAgent \
31+ --trusted-mir-socket=/var/run/user/$(id -u)/mir_socket_trusted \
32+ --for-service UbuntuLocationService \
33+ --store-bus session
34+end script

Subscribers

People subscribed via source and target branches