Merge lp:~mandel/location-service/trust-store-fixes into lp:location-service/trunk

Proposed by Manuel de la Peña on 2015-04-30
Status: Approved
Approved by: Michael Frey on 2015-04-30
Approved revision: 202
Proposed branch: lp:~mandel/location-service/trust-store-fixes
Merge into: lp:location-service/trunk
Prerequisite: lp:~mandel/location-service/tvoss-time-delta-fixes
Diff against target: 15 lines (+4/-2)
1 file modified
data/ubuntu-location-service-trust-stored.conf.in (+4/-2)
To merge this branch: bzr merge lp:~mandel/location-service/trust-store-fixes
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-04-30
Michael Frey (community) 2015-04-30 Approve on 2015-04-30
Review via email: mp+257908@code.launchpad.net

Commit message

Update the trust store upstart job that was broken with the move to systemd.

Description of the change

Update the trust store upstart job that was broken with the move to systemd.

To post a comment you must log in.
Michael Frey (mfrey) wrote :

tested and works

review: Approve
203. By Manuel de la Peña on 2015-05-26

Merged tvoss-time-delta-fixes into trust-store-fixes.

Unmerged revisions

203. By Manuel de la Peña on 2015-05-26

Merged tvoss-time-delta-fixes into trust-store-fixes.

202. By Manuel de la Peña on 2015-04-29

Use the name owner change to ensure that we are stopped and started correctly.

201. By Manuel de la Peña on 2015-04-29

Revert logging and add fixes to the upstart job.

200. By Manuel de la Peña on 2015-04-29

Fix compiling errors.

199. By Manuel de la Peña on 2015-04-29

More logging to help fixing the issue. Reorg the threads to have the utgoing to be the first one.

198. By Manuel de la Peña on 2015-04-29

Merged tvoss-time-delta-fixes into trust-store-fixes.

197. By Manuel de la Peña on 2015-04-29

Merged tvoss-time-delta-fixes into trust-store-fixes.

196. By Manuel de la Peña on 2015-04-28

Log the exceptions.

195. By Manuel de la Peña on 2015-04-27

Added code according to the reviews.

194. By Manuel de la Peña on 2015-04-27

Merged verbose-logging into tvoss-time-delta-fixes.

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-09-19 14:36:51 +0000
3+++ data/ubuntu-location-service-trust-stored.conf.in 2015-05-26 16:07:18 +0000
4@@ -4,8 +4,10 @@
5 # starting; if dbus is available and location-service isn't or vice-versa,
6 # startup will fail but the next event firing will trigger another start
7 start on (started dbus and xsession SESSION=ubuntu-touch) or \
8- :sys:started JOB=ubuntu-location-service
9-stop on desktop-end or :sys:stopping JOB=ubuntu-location-service
10+ dbus BUS=system SIGNAL=NameOwnerChanged INTERFACE=org.freedesktop.DBus OBJPATH=/org/freedesktop/DBus ARG0=com.ubuntu.location.Service ARG2!=""
11+
12+stop on desktop-end or \
13+ dbus BUS=system SIGNAL=NameOwnerChanged INTERFACE=org.freedesktop.DBus OBJPATH=/org/freedesktop/DBus ARG0=com.ubuntu.location.Service ARG2=""
14
15 respawn
16

Subscribers

People subscribed via source and target branches