Merge lp:~mvo/snappy/snappy-lp1490574-systemd-type-forking into lp:~snappy-dev/snappy/snappy-moved-to-github

[Michael Vogt]

Add support for "forking"

Tiny branch that adds "type: forking" to the services yaml to support daemons that fork with systemd.

[John Lenton (chipaca)]

Just add docs, and it's good to go ;)

[Michael Vogt (mvo)]

Thanks, docs added.

[John Lenton (chipaca)]

review: Approve

[Snappy Tarmac (snappydevtarmac)]

Attempt to merge into lp:snappy failed due to conflicts:

text conflict in snappy/click.go
text conflict in snappy/click_test.go
text conflict in systemd/systemd.go

[Snappy Tarmac (snappydevtarmac)]

Attempt to merge into lp:snappy failed due to conflicts:

text conflict in snappy/click.go
text conflict in snappy/click_test.go
text conflict in systemd/systemd.go

[Snappy Tarmac (snappydevtarmac)]

Attempt to merge into lp:snappy failed due to conflicts:

text conflict in snappy/click.go
text conflict in snappy/click_test.go
text conflict in systemd/systemd.go

[Snappy Tarmac (snappydevtarmac)]

Attempt to merge into lp:snappy failed due to conflicts:

text conflict in snappy/click.go
text conflict in snappy/click_test.go
text conflict in systemd/systemd.go

[lp:~mvo/snappy/snappy-lp1490574-systemd-type-forking]

653. By Michael Vogt on 2015-09-15

merged trunk and resolved conflicts

[Michael Vogt (mvo)]

review: Approve

=== modified file 'docs/meta.md'
--- docs/meta.md	2015-09-04 09:42:44 +0000
+++ docs/meta.md	2015-09-15 14:53:47 +0000
@@ -46,7 +46,9 @@
     * `stop`: (optional) the command to stop the service
     * `stop-timeout`: (optional) the time in seconds to wait for the
                       service to stop
-    * `poststop`: a command that runs after the service has stopped
+    * `poststop`: (optional) a command that runs after the service has stopped
+    * `forking`: (optional) set to "true" if the service calls fork() as
+                 part of its startup
     * `caps`: (optional) list of additional security policies to add.
               See `security.md` for details
     * `security-template`: (optional) alternate security template to use

=== modified file 'snappy/click.go'
--- snappy/click.go	2015-09-15 12:55:09 +0000
+++ snappy/click.go	2015-09-15 14:53:47 +0000
@@ -449,6 +449,7 @@
 			IsFramework:    m.Type == pkg.TypeFramework,
 			IsNetworked:    service.Ports != nil && len(service.Ports.External) > 0,
 			BusName:        service.BusName,
+			Forking:        service.Forking,
 			UdevAppName:    udevPartName,
 			Socket:         service.Socket,
 			SocketFileName: socketFileName,

=== modified file 'snappy/click_test.go'
--- snappy/click_test.go	2015-09-15 12:55:09 +0000
+++ snappy/click_test.go	2015-09-15 14:53:47 +0000
@@ -1234,12 +1234,33 @@
 [Install]
 WantedBy=multi-user.target
 `
-	expectedServiceAppWrapper  = fmt.Sprintf(expectedServiceWrapperFmt, "After=ubuntu-snappy.frameworks.target\nRequires=ubuntu-snappy.frameworks.target", ".canonical", "canonical", "\n", helpers.UbuntuArchitecture())
-	expectedNetAppWrapper      = fmt.Sprintf(expectedServiceWrapperFmt, "After=ubuntu-snappy.frameworks.target\nRequires=ubuntu-snappy.frameworks.target\nAfter=snappy-wait4network.service\nRequires=snappy-wait4network.service", ".canonical", "canonical", "\n", helpers.UbuntuArchitecture())
-	expectedServiceFmkWrapper  = fmt.Sprintf(expectedServiceWrapperFmt, "Before=ubuntu-snappy.frameworks.target\nAfter=ubuntu-snappy.frameworks-pre.target\nRequires=ubuntu-snappy.frameworks-pre.target", "", "", "BusName=foo.bar.baz\nType=dbus", helpers.UbuntuArchitecture())
-	expectedSocketUsingWrapper = fmt.Sprintf(expectedServiceWrapperFmt, "After=ubuntu-snappy.frameworks.target xkcd-webserver_xkcd-webserver_0.3.4.socket\nRequires=ubuntu-snappy.frameworks.target xkcd-webserver_xkcd-webserver_0.3.4.socket", ".canonical", "canonical", "\n", helpers.UbuntuArchitecture())
+	expectedServiceAppWrapper     = fmt.Sprintf(expectedServiceWrapperFmt, "After=ubuntu-snappy.frameworks.target\nRequires=ubuntu-snappy.frameworks.target", ".canonical", "canonical", "\n", helpers.UbuntuArchitecture())
+	expectedNetAppWrapper         = fmt.Sprintf(expectedServiceWrapperFmt, "After=ubuntu-snappy.frameworks.target\nRequires=ubuntu-snappy.frameworks.target\nAfter=snappy-wait4network.service\nRequires=snappy-wait4network.service", ".canonical", "canonical", "\n", helpers.UbuntuArchitecture())
+	expectedServiceFmkWrapper     = fmt.Sprintf(expectedServiceWrapperFmt, "Before=ubuntu-snappy.frameworks.target\nAfter=ubuntu-snappy.frameworks-pre.target\nRequires=ubuntu-snappy.frameworks-pre.target", "", "", "BusName=foo.bar.baz\nType=dbus", helpers.UbuntuArchitecture())
+	expectedSocketUsingWrapper    = fmt.Sprintf(expectedServiceWrapperFmt, "After=ubuntu-snappy.frameworks.target xkcd-webserver_xkcd-webserver_0.3.4.socket\nRequires=ubuntu-snappy.frameworks.target xkcd-webserver_xkcd-webserver_0.3.4.socket", ".canonical", "canonical", "\n", helpers.UbuntuArchitecture())
+	expectedTypeForkingFmkWrapper = fmt.Sprintf(expectedServiceWrapperFmt, "After=ubuntu-snappy.frameworks.target\nRequires=ubuntu-snappy.frameworks.target", ".canonical", "canonical", "Type=forking\n", helpers.UbuntuArchitecture())
 )
 
+func (s *SnapTestSuite) TestSnappyGenerateSnapServiceTypeForking(c *C) {
+	service := ServiceYaml{
+		Name:        "xkcd-webserver",
+		Start:       "bin/foo start",
+		Stop:        "bin/foo stop",
+		PostStop:    "bin/foo post-stop",
+		StopTimeout: DefaultTimeout,
+		Description: "A fun webserver",
+		Forking:     true,
+	}
+	pkgPath := "/apps/xkcd-webserver.canonical/0.3.4/"
+	aaProfile := "xkcd-webserver.canonical_xkcd-webserver_0.3.4"
+	m := packageYaml{Name: "xkcd-webserver",
+		Version: "0.3.4"}
+
+	generatedWrapper, err := generateSnapServicesFile(service, pkgPath, aaProfile, &m)
+	c.Assert(err, IsNil)
+	c.Assert(generatedWrapper, Equals, expectedTypeForkingFmkWrapper)
+}
+
 func (s *SnapTestSuite) TestSnappyGenerateSnapServiceAppWrapper(c *C) {
 	service := ServiceYaml{
 		Name:        "xkcd-webserver",

=== modified file 'snappy/snapp.go'
--- snappy/snapp.go	2015-09-15 12:55:09 +0000
+++ snappy/snapp.go	2015-09-15 14:53:47 +0000
@@ -148,6 +148,7 @@
 	PostStop    string  `yaml:"poststop,omitempty" json:"poststop,omitempty"`
 	StopTimeout Timeout `yaml:"stop-timeout,omitempty" json:"stop-timeout,omitempty"`
 	BusName     string  `yaml:"bus-name,omitempty" json:"bus-name,omitempty"`
+	Forking     bool    `yaml:"forking,omitempty" json:"forking,omitempty"`
 
 	// set to yes if we need to create a systemd socket for this service
 	Socket       bool   `yaml:"socket,omitempty" json:"socket,omitempty"`

=== modified file 'systemd/systemd.go'
--- systemd/systemd.go	2015-09-15 10:09:38 +0000
+++ systemd/systemd.go	2015-09-15 14:53:47 +0000
@@ -116,6 +116,7 @@
 	IsNetworked     bool
 	BusName         string
 	UdevAppName     string
+	Forking         bool
 	Socket          bool
 	SocketFileName  string
 	ListenStream    string
@@ -310,8 +311,9 @@
 {{if .Stop}}ExecStop=/usr/bin/ubuntu-core-launcher {{.UdevAppName}} {{.AaProfile}} {{.FullPathStop}}{{end}}
 {{if .PostStop}}ExecStopPost=/usr/bin/ubuntu-core-launcher {{.UdevAppName}} {{.AaProfile}} {{.FullPathPostStop}}{{end}}
 {{if .StopTimeout}}TimeoutStopSec={{.StopTimeout.Seconds}}{{end}}
-{{if .BusName}}BusName={{.BusName}}{{end}}
-{{if .BusName}}Type=dbus{{end}}
+{{if .BusName}}BusName={{.BusName}}
+Type=dbus{{else}}{{if .Forking}}Type=forking{{end}}
+{{end}}
 
 [Install]
 WantedBy={{.ServiceSystemdTarget}}