systemdinstaller: add support for ServiceTypeNotify

Author: joonas-fi

os/systemdinstaller/systemdinstaller.go

@@ -12,6 +12,7 @@ import (
 
 type ServiceDefinition struct {
 	serviceName      string
+	serviceType      serviceType
 	args             []string
 	description      string
 	docs             []string
@@ -24,6 +25,14 @@ type ServiceDefinition struct {
 	err              error // if error reading selfAbsolutePath
 }
 
+// affects how service manager gauges the service start success (which if fails, can make service manager restart the service)
+type serviceType string
+
+const (
+	ServiceTypeExec   serviceType = "exec"   // will consider the unit started immediately after the main service binary has been executed
+	ServiceTypeNotify serviceType = "notify" // it is expected that the service sends a "READY=1" notification message
+)
+
 type Option func(*ServiceDefinition)
 
 func Service(serviceName string, description string, opts ...Option) ServiceDefinition {
@@ -40,6 +49,7 @@ func newService(serviceName string, description string, opts []Option, userServi
 	selfAbsolutePath, err := currentExecutableNoFollowSymlink()
 
 	sf := ServiceDefinition{
+		serviceType:      ServiceTypeExec,
 		userService:      userService,
 		serviceName:      serviceName,
 		description:      description,
@@ -153,6 +163,7 @@ func serialize(sf ServiceDefinition) string {
 	l("")
 	l("[Service]")
 	l("ExecStart=" + strings.Join(append([]string{sf.selfAbsolutePath}, sf.args...), " "))
+	l("Type=" + string(sf.serviceType))
 	l("WorkingDirectory=" + filepath.Dir(sf.selfAbsolutePath))
 	l("Restart=always")
 	l("RestartSec=10s")
@@ -181,6 +192,12 @@ func unitfilePath(sf ServiceDefinition) (string, error) {
 	}
 }
 
+func Type(typ serviceType) Option {
+	return func(sf *ServiceDefinition) {
+		sf.serviceType = typ
+	}
+}
+
 // FIXME(security): args are not shell escaped - DO NOT TAKE THIS FROM USER INPUT
 func Args(args ...string) Option {
 	return func(sf *ServiceDefinition) {

os/systemdinstaller/systemdinstaller_test.go

@@ -19,6 +19,7 @@ WantedBy=multi-user.target
 
 [Service]
 ExecStart=/home/dummy/testservice_amd64 start
+Type=exec
 WorkingDirectory=/home/dummy
 Restart=always
 RestartSec=10s
@@ -45,6 +46,7 @@ WantedBy=default.target
 
 [Service]
 ExecStart=/home/dummy/testservice_amd64 start
+Type=exec
 WorkingDirectory=/home/dummy
 Restart=always
 RestartSec=10s
@@ -71,6 +73,7 @@ WantedBy=multi-user.target
 
 [Service]
 ExecStart=/home/dummy/testservice_amd64 start
+Type=exec
 WorkingDirectory=/home/dummy
 Restart=always
 RestartSec=10s
@@ -90,6 +93,7 @@ WantedBy=multi-user.target
 
 [Service]
 ExecStart=/home/dummy/testservice_amd64
+Type=exec
 WorkingDirectory=/home/dummy
 Restart=always
 RestartSec=10s
@@ -108,6 +112,7 @@ WantedBy=multi-user.target
 
 [Service]
 ExecStart=/home/dummy/testservice_amd64
+Type=exec
 WorkingDirectory=/home/dummy
 Restart=always
 RestartSec=10s
@@ -129,6 +134,26 @@ WantedBy=multi-user.target
 
 [Service]
 ExecStart=/home/dummy/testservice_amd64
+Type=exec
+WorkingDirectory=/home/dummy
+Restart=always
+RestartSec=10s
+`)
+}
+
+func TestTypeNotify(t *testing.T) {
+	sf := Service("testservice", "My cool service", Type(ServiceTypeNotify))
+	sf = fixForTest(sf)
+
+	assert.Equal(t, serialize(sf), `[Unit]
+Description=My cool service
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+ExecStart=/home/dummy/testservice_amd64
+Type=notify
 WorkingDirectory=/home/dummy
 Restart=always
 RestartSec=10s