Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

many: implement "refresh-mode: {restart,endure,...}" for services #4617

Merged
merged 13 commits into from
Feb 19, 2018
Merged

many: implement "refresh-mode: {restart,endure,...}" for services #4617

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6392b90
many: implement "refresh-mode: survive" for services
mvo5 Feb 5, 2018
5761d07
tests: add missing file for test-snapd-service
mvo5 Feb 6, 2018
bd7671f
many: add new snap.ServiceStopReason and improve tests
mvo5 Feb 6, 2018
b25c7f5
many: address review feedback and improve tests
mvo5 Feb 7, 2018
7b774c6
Merge remote-tracking branch 'upstream/master' into dont-kill-me
mvo5 Feb 8, 2018
dbc944a
snap: rename refresh-mode: `survive` to `keep`
mvo5 Feb 8, 2018
8622cac
many: support `refresh-mode: sig{term,hup,usr1}{,-all}`
mvo5 Feb 8, 2018
157f7f5
Merge remote-tracking branch 'upstream/master' into dont-kill-me
mvo5 Feb 13, 2018
2f75292
address review feedback
mvo5 Feb 13, 2018
7486f28
tests: do not trap TERM in snap-service-refresh-mode to avoid long ti…
mvo5 Feb 14, 2018
0c3020a
tests: add debug to snap-service-refresh-mode
mvo5 Feb 14, 2018
d83ffe4
add debug to identify test failure
mvo5 Feb 14, 2018
f463b38
Merge remote-tracking branch 'upstream/master' into dont-kill-me
mvo5 Feb 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add debug to identify test failure
  • Loading branch information
@mvo5
mvo5 committed Feb 14, 2018
commit d83ffe404af8bb26486dc6598bf8d13a073a3709
2 changes: 2 additions & 0 deletions wrappers/services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ func AddSnapServices(s *snap.Info, inter interacter) (err error) {
func StopServices(apps []*snap.AppInfo, reason snap.ServiceStopReason, inter interacter) error {
sysd := systemd.New(dirs.GlobalRootDir, inter)

logger.Debugf("StopServices called for %q, reason: %v", apps, reason)
for _, app := range apps {
// Handle the case where service file doesn't exist and don't try to stop it as it will fail.
// This can happen with snap try when snap.yaml is modified on the fly and a daemon line is added.
Expand All @@ -227,6 +228,7 @@ func StopServices(apps []*snap.AppInfo, reason snap.ServiceStopReason, inter int
// Skip stop on refresh when refresh mode is set to something
// other than "restart" (or "" which is the same)
if reason == snap.StopReasonRefresh {
logger.Debugf(" %s refresh-mode: %v", app.Name, app.RefreshMode)
switch app.RefreshMode {
case "endure":
// skip this service
Expand Down