wrappers/services: RemainAfterExit=yes for oneshot daemons w/ stop cmds #2920
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
February 22, 2017 15:26
systemd complains if you generate a service file for a oneshot daemon that also includes an ExecStop directive but doesn't specify RemainAfterExit=yes. systemd needs this keep track of the service after the command exits. Also adds a test for this. Fixes: https://bugs.launchpad.net/snappy/+bug/1647169
zyga
approved these changes
Feb 22, 2017
| @@ -170,7 +170,7 @@ func RemoveSnapServices(s *snap.Info, inter interacter) error { | |||
|
|
|||
| func genServiceFile(appInfo *snap.AppInfo) string { | |||
| serviceTemplate := `[Unit] | |||
| # Auto-generated, DO NO EDIT | |||
| # Auto-generated, DO NOT EDIT | |||
| @@ -204,6 +205,17 @@ WantedBy={{.ServicesTarget}} | |||
| restartCond = systemd.RestartOnFailure.String() | |||
| } | |||
|
|
|||
| var remain string | |||
| if appInfo.Daemon == "oneshot" { | |||
There was a problem hiding this comment.
Just thinking aloud. Is there any other condition where we would like to have remain-after-exit set?
wrappers/services_gen_test.go
Outdated
| daemon: oneshot | ||
| ` | ||
|
|
||
| info, err := snap.InfoFromSnapYaml([]byte(yamlText)) |
There was a problem hiding this comment.
We have snaptest.MockYaml from snap/snaptest for this purpose. Please use it here
There was a problem hiding this comment.
@zyga Do you mean snaptest.MockSnap? I don't see a MockYaml anywhere.
There was a problem hiding this comment.
Sorry, I meant MockInfo :-) They differ subtly but I think all you need is MockInfo
mvo5
approved these changes
Feb 23, 2017
…neshot-daemons
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
systemd complains if you generate a service file for a oneshot daemon
that also includes an ExecStop directive but doesn't specify
RemainAfterExit=yes. systemd needs this keep track of the service after
the command exits.
Also adds a test for this and fixes a typo in the opening comment of the generated systemd unit file.
Fixes: https://bugs.launchpad.net/snappy/+bug/1647169