Merge lp:~mterry/snappy/systemd-restart-15.04 into lp:~snappy-dev/snappy/15.04-deprecated

[Michael Terry]

Restart systemd services on failure by default

This is a backport of r492 from trunk.

Set all app services to restart on failure.

See http://www.freedesktop.org/software/systemd/man/systemd.service.html for how systemd treats Restart=on-failure.

This is a backport of r492 from trunk.

[Ricardo Salveti (rsalveti)]

Looks good, thanks!

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~mterry/snappy/systemd-restart-15.04 into lp:snappy/15.04 failed. Below is the output from the failed tests.

Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update code.google.com/p/go.crypto failed; trying to fetch newer version
update github.com/blakesmith/ar failed; trying to fetch newer version
code.google.com/p/go.crypto now at 69e2a90ed92d03812364aeb947b7068dc42e561e
update github.com/cheggaaa/pb failed; trying to fetch newer version
github.com/blakesmith/ar now at c9a977dd0cc1392b023382c7bfa5a22af8d3b730
update github.com/jessevdk/go-flags failed; trying to fetch newer version
github.com/cheggaaa/pb now at e8c7cc515bfde3e267957a3b110080ceed51354e
update github.com/juju/loggo failed; trying to fetch newer version
github.com/jessevdk/go-flags now at 15347ef417a300349807983f15af9e65cd2e1b3a
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/juju/loggo now at 4c7cbce140ca070eeb59a28f4bf9507e511711f9
update gopkg.in/yaml.v2 failed; trying to fetch newer version
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
update launchpad.net/gocheck failed; trying to fetch newer version
gopkg.in/yaml.v2 now at 49c95bdc21843256fb6c4e0d370a05f24a0bf213
launchpad.net/gocheck now at <email address hidden>
Building
Running tests from /home/tarmac/tmp/tmp.mz0bcXNGo4/src/launchpad.net/snappy
=== RUN Test
OK: 10 passed
--- PASS: Test (0.34 seconds)
PASS
coverage: 79.3% of statements
ok launchpad.net/snappy/clickdeb 0.346s coverage: 79.3% of statements
=== RUN Test
OK: 6 passed
--- PASS: Test (0.01 seconds)
PASS
coverage: 12.7% of statements
ok launchpad.net/snappy/cmd/snappy 0.019s coverage: 12.7% of statements
=== RUN Test
OK: 24 passed
--- PASS: Test (0.08 seconds)
PASS
coverage: 100.0% of statements
ok launchpad.net/snappy/coreconfig 0.087s coverage: 100.0% of statements
=== RUN Test
OK: 33 passed
--- PASS: Test (1.69 seconds)
PASS
coverage: 74.0% of statements
ok launchpad.net/snappy/helpers 1.697s coverage: 74.0% of statements
=== RUN Test
OK: 7 passed
--- PASS: Test (0.05 seconds)
PASS
coverage: 92.5% of statements
ok launchpad.net/snappy/logger 0.063s coverage: 92.5% of statements
=== RUN Test
OK: 38 passed
--- PASS: Test (0.18 seconds)
PASS
coverage: 82.2% of statements
ok launchpad.net/snappy/partition 0.190s coverage: 82.2% of statements
=== RUN Test
OK: 12 passed
--- PASS: Test (0.09 seconds)
PASS
coverage: 87.8% of statements
ok launchpad.net/snappy/policy 0.094s coverage: 87.8% of statements
=== RUN Test
OK: 3 passed
--- PASS: Test (0.00 seconds)
PASS
coverage: 84.8% of statements
ok launchpad.net/snappy/priv 0.005s coverage: 84.8% of statements
=== RUN Test
OK: 4 passed
--- PASS: Test (0.01 seconds)
PASS
coverage: 50.0% of statements
ok launchpad.net/snappy/progress 0.009s coverage: 50.0% of statements
=== RUN Test
OK: 6 passed
--- PASS: Test (0.01 seconds)
PASS
coverage: 100.0% of statements
ok launchpad.net/snappy/release 0.010s coverage: 100.0% of statements
=== RUN Test
2015-07-06 18:43:42 ERROR snappy logger.go:199 hello-app.potato failed to install: a package by that name is...

=== modified file 'snappy/click_test.go'
--- snappy/click_test.go	2015-06-03 19:34:38 +0000
+++ snappy/click_test.go	2015-07-06 15:34:31 +0000
@@ -1189,6 +1189,7 @@
 
 [Service]
 ExecStart=/usr/bin/ubuntu-core-launcher xkcd-webserver%s xkcd-webserver%[2]s_xkcd-webserver_0.3.4 /apps/xkcd-webserver%[2]s/0.3.4/bin/foo start
+Restart=on-failure
 WorkingDirectory=/apps/xkcd-webserver%[2]s/0.3.4/
 Environment="SNAP_APP=xkcd-webserver_xkcd-webserver_0.3.4" "TMPDIR=/tmp/snaps/xkcd-webserver%[2]s/0.3.4/tmp" "TEMPDIR=/tmp/snaps/xkcd-webserver%[2]s/0.3.4/tmp" "SNAP_APP_PATH=/apps/xkcd-webserver%[2]s/0.3.4/" "SNAP_APP_DATA_PATH=/var/lib/apps/xkcd-webserver%[2]s/0.3.4/" "SNAP_APP_TMPDIR=/tmp/snaps/xkcd-webserver%[2]s/0.3.4/tmp" "SNAP_NAME=xkcd-webserver" "SNAP_VERSION=0.3.4" "SNAP_ORIGIN=%[3]s" "SNAP_FULLNAME=xkcd-webserver%[2]s" "SNAP_ARCH=%[5]s" "SNAP_APP_USER_DATA_PATH=%%h/apps/xkcd-webserver%[2]s/0.3.4/" "SNAPP_APP_PATH=/apps/xkcd-webserver%[2]s/0.3.4/" "SNAPP_APP_DATA_PATH=/var/lib/apps/xkcd-webserver%[2]s/0.3.4/" "SNAPP_APP_TMPDIR=/tmp/snaps/xkcd-webserver%[2]s/0.3.4/tmp" "SNAPPY_APP_ARCH=%[5]s" "SNAPP_APP_USER_DATA_PATH=%%h/apps/xkcd-webserver%[2]s/0.3.4/"
 ExecStop=/usr/bin/ubuntu-core-launcher xkcd-webserver%[2]s xkcd-webserver%[2]s_xkcd-webserver_0.3.4 /apps/xkcd-webserver%[2]s/0.3.4/bin/foo stop

=== modified file 'systemd/systemd.go'
--- systemd/systemd.go	2015-06-03 19:34:38 +0000
+++ systemd/systemd.go	2015-07-06 15:34:31 +0000
@@ -179,6 +179,7 @@
 
 [Service]
 ExecStart=/usr/bin/ubuntu-core-launcher {{.UdevAppName}} {{.AaProfile}} {{.FullPathStart}}
+Restart=on-failure
 WorkingDirectory={{.AppPath}}
 Environment="SNAP_APP={{.AppTriple}}" {{.EnvVars}}
 {{if .Stop}}ExecStop=/usr/bin/ubuntu-core-launcher {{.UdevAppName}} {{.AaProfile}} {{.FullPathStop}}{{end}}

=== modified file 'systemd/systemd_test.go'
--- systemd/systemd_test.go	2015-06-03 19:34:38 +0000
+++ systemd/systemd_test.go	2015-07-06 15:34:31 +0000
@@ -153,6 +153,7 @@
 
 [Service]
 ExecStart=/usr/bin/ubuntu-core-launcher app%[2]s aa-profile /apps/app%[2]s/1.0/bin/start
+Restart=on-failure
 WorkingDirectory=/apps/app%[2]s/1.0/
 Environment="SNAP_APP=app_service_1.0" "TMPDIR=/tmp/snaps/app%[2]s/1.0/tmp" "TEMPDIR=/tmp/snaps/app%[2]s/1.0/tmp" "SNAP_APP_PATH=/apps/app%[2]s/1.0/" "SNAP_APP_DATA_PATH=/var/lib/apps/app%[2]s/1.0/" "SNAP_APP_TMPDIR=/tmp/snaps/app%[2]s/1.0/tmp" "SNAP_NAME=app" "SNAP_VERSION=1.0" "SNAP_ORIGIN=%[3]s" "SNAP_FULLNAME=app%[2]s" "SNAP_ARCH=%[5]s" "SNAP_APP_USER_DATA_PATH=%%h/apps/app%[2]s/1.0/" "SNAPP_APP_PATH=/apps/app%[2]s/1.0/" "SNAPP_APP_DATA_PATH=/var/lib/apps/app%[2]s/1.0/" "SNAPP_APP_TMPDIR=/tmp/snaps/app%[2]s/1.0/tmp" "SNAPPY_APP_ARCH=%[5]s" "SNAPP_APP_USER_DATA_PATH=%%h/apps/app%[2]s/1.0/"
 ExecStop=/usr/bin/ubuntu-core-launcher app%[2]s aa-profile /apps/app%[2]s/1.0/bin/stop