URL Dispatcher

Merge lp:~ted/url-dispatcher/no-sleep-for-the-refresh into lp:url-dispatcher

  1. no-sleep-for-the-refresh
  2. Merge into trunk.17.04
Proposed by Ted Gould
Status: Merged
Approved by: Michael Terry
Approved revision: 98
Merged at revision: 98
Proposed branch: lp:~ted/url-dispatcher/no-sleep-for-the-refresh
Merge into: lp:url-dispatcher
Diff against target: 42 lines (+2/-8)
3 files modified
data/url-dispatcher-refresh.conf.in (+0/-8)
data/url-dispatcher-update-system.conf.in (+1/-0)
data/url-dispatcher-update-user.conf.in (+1/-0)
To merge this branch: bzr merge lp:~ted/url-dispatcher/no-sleep-for-the-refresh
Reviewer Review Type Date Requested Status
Michael Terry Approve
unity-api-1-bot continuous-integration Needs Fixing
Review via email: mp+310564@code.launchpad.net

Commit message

Instead of sleeping make the refresh tasks low enough priority they don't get in the way

Description of the change

Helps logout on the snap as well

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:98
https://jenkins.canonical.com/unity-api-1/job/lp-url-dispatcher-ci/29/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1045/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1052/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-url-dispatcher-ci/29/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Terry (mterry) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/url-dispatcher-refresh.conf.in'
--- data/url-dispatcher-refresh.conf.in 2014-08-20 18:58:49 +0000
+++ data/url-dispatcher-refresh.conf.in 2016-11-10 16:59:36 +0000
@@ -4,14 +4,6 @@
44
5emits url-dispatcher-update-user url-dispatcher-update-system5emits url-dispatcher-update-user url-dispatcher-update-system
66
7pre-start script
8# If we're starting with url-dispatcher let's let the rest of the
9# system have a chance to settle.
10 if [ "$UPSTART_EVENTS" = "started" ] ; then
11 sleep 60
12 fi
13end script
14
15script7script
16 initctl emit url-dispatcher-update-system8 initctl emit url-dispatcher-update-system
17 initctl emit url-dispatcher-update-user9 initctl emit url-dispatcher-update-user
1810
=== modified file 'data/url-dispatcher-update-system.conf.in'
--- data/url-dispatcher-update-system.conf.in 2016-11-08 19:53:01 +0000
+++ data/url-dispatcher-update-system.conf.in 2016-11-10 16:59:36 +0000
@@ -3,6 +3,7 @@
3start on (file FILE=@datadir@/url-dispatcher/urls/*.url-dispatcher) or url-dispatcher-update-system3start on (file FILE=@datadir@/url-dispatcher/urls/*.url-dispatcher) or url-dispatcher-update-system
44
5task5task
6nice 19
67
7pre-start script8pre-start script
8 RUNNING=$(initctl status url-dispatcher | grep start/running 2> /dev/null)9 RUNNING=$(initctl status url-dispatcher | grep start/running 2> /dev/null)
910
=== modified file 'data/url-dispatcher-update-user.conf.in'
--- data/url-dispatcher-update-user.conf.in 2016-11-08 22:14:54 +0000
+++ data/url-dispatcher-update-user.conf.in 2016-11-10 16:59:36 +0000
@@ -3,6 +3,7 @@
3start on (file FILE=~/.config/url-dispatcher/urls/*.url-dispatcher) or url-dispatcher-update-user3start on (file FILE=~/.config/url-dispatcher/urls/*.url-dispatcher) or url-dispatcher-update-user
44
5task5task
6nice 19
67
7pre-start script8pre-start script
8 RUNNING=$(initctl status url-dispatcher | grep start/running 2> /dev/null)9 RUNNING=$(initctl status url-dispatcher | grep start/running 2> /dev/null)

Subscribers

People subscribed via source and target branches