Merge lp:~mterry/snappy/systemd-restart into lp:~snappy-dev/snappy/snappy-moved-to-github

[Michael Terry]

Set all app services to restart on failure.

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.

There was talk on the snappy-app-devel mailing list about not using this key for dbus-activated services. But we don't support those right now.

(We do use the Type=dbus property, but that doesn't mean it's an dbus-activated service -- for that, we'd need to drop the [Install] section and add SystemdService= to the dbus service file. I believe... I'm not an expert with systemd.)

[Michael Vogt (mvo)]

Thanks a bunch! This looks good.

review: Approve

[Martin Pitt (pitti)]

LGTM.

For D-Bus services, these indeed don't have an [Install], but Type=dbus and BusName=org.bla.foo instead. For those we indeed shouldn't have a Restart=, but having it is not the end of the world (mostly just an optimization problem).

review: Approve

=== modified file 'snappy/click_test.go'
--- snappy/click_test.go	2015-06-03 14:03:45 +0000
+++ snappy/click_test.go	2015-06-05 18:36:45 +0000
@@ -1162,6 +1162,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 14:01:51 +0000
+++ systemd/systemd.go	2015-06-05 18:36:45 +0000
@@ -181,6 +181,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 14:03:45 +0000
+++ systemd/systemd_test.go	2015-06-05 18:36:45 +0000
@@ -155,6 +155,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