Merge branch 'release/v0.12.0'

README.md

@@ -174,6 +174,41 @@ func main() {
 }
 ```
 
+### Service config file
+
+Optionally, service config file can be retrieved or updated by calling
+`GetTemplate() string` and `SetTemplate(string)` methods(except MS
+Windows). Template will be a default Go Template(`"text/template"`).
+
+If `SetTemplate` is not called, default template content will be used
+while creating service.
+
+|Variable | Description|
+|---------|------------|
+|Description| Description for service |
+|Dependencies|Service dependencies|
+|Name|Service name|
+|Path|Path of service executable|
+|Args|Arguments for service executable|
+
+#### Example template(for linux systemv)
+
+```ini
+[Unit]
+Description={{.Description}}
+Requires={{.Dependencies}}
+After={{.Dependencies}}
+
+[Service]
+PIDFile=/var/run/{{.Name}}.pid
+ExecStartPre=/bin/rm -f /var/run/{{.Name}}.pid
+ExecStart={{.Path}} {{.Args}}
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
+```
+
 ### Cron example
 
 See `examples/cron/cron_job.go`

daemon.go

@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 /*
-Package daemon 0.11.0 for use with Go (golang) services.
+Package daemon v0.12.0 for use with Go (golang) services.
 
 Package daemon provides primitives for daemonization of golang services.
 This package is not provide implementation of user daemon,
@@ -157,8 +157,18 @@ package daemon
 
 import "strings"
 
+// Status constants.
+const (
+	statNotInstalled = "Service not installed"
+)
+
 // Daemon interface has a standard set of methods/commands
 type Daemon interface {
+	// GetTemplate - gets service config template
+	GetTemplate() string
+
+	// SetTemplate - sets service config template
+	SetTemplate(string) error
 
 	// Install the service into the system
 	Install(args ...string) (string, error)

daemon_darwin.go

@@ -178,7 +178,7 @@ func (darwin *darwinRecord) Status() (string, error) {
 	}
 
 	if !darwin.isInstalled() {
-		return "Status could not defined", ErrNotInstalled
+		return statNotInstalled, ErrNotInstalled
 	}
 
 	statusAction, _ := darwin.checkRunning()
@@ -193,6 +193,17 @@ func (darwin *darwinRecord) Run(e Executable) (string, error) {
 	return runAction + " completed.", nil
 }
 
+// GetTemplate - gets service config template
+func (linux *darwinRecord) GetTemplate() string {
+	return propertyList
+}
+
+// SetTemplate - sets service config template
+func (linux *darwinRecord) SetTemplate(tplStr string) error {
+	propertyList = tplStr
+	return nil
+}
+
 var propertyList = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">

daemon_freebsd.go

@@ -219,7 +219,7 @@ func (bsd *bsdRecord) Status() (string, error) {
 	}
 
 	if !bsd.isInstalled() {
-		return "Status could not defined", ErrNotInstalled
+		return statNotInstalled, ErrNotInstalled
 	}
 
 	statusAction, _ := bsd.checkRunning()
@@ -234,6 +234,17 @@ func (bsd *bsdRecord) Run(e Executable) (string, error) {
 	return runAction + " completed.", nil
 }
 
+// GetTemplate - gets service config template
+func (linux *bsdRecord) GetTemplate() string {
+	return bsdConfig
+}
+
+// SetTemplate - sets service config template
+func (linux *bsdRecord) SetTemplate(tplStr string) error {
+	bsdConfig = tplStr
+	return nil
+}
+
 var bsdConfig = `#!/bin/sh
 #
 # PROVIDE: {{.Name}}

daemon_linux_systemd.go

@@ -184,7 +184,7 @@ func (linux *systemDRecord) Status() (string, error) {
 	}
 
 	if !linux.isInstalled() {
-		return "Status could not defined", ErrNotInstalled
+		return statNotInstalled, ErrNotInstalled
 	}
 
 	statusAction, _ := linux.checkRunning()
@@ -199,6 +199,17 @@ func (linux *systemDRecord) Run(e Executable) (string, error) {
 	return runAction + " completed.", nil
 }
 
+// GetTemplate - gets service config template
+func (linux *systemDRecord) GetTemplate() string {
+	return systemDConfig
+}
+
+// SetTemplate - sets service config template
+func (linux *systemDRecord) SetTemplate(tplStr string) error {
+	systemDConfig = tplStr
+	return nil
+}
+
 var systemDConfig = `[Unit]
 Description={{.Description}}
 Requires={{.Dependencies}}

daemon_linux_systemv.go

@@ -192,7 +192,7 @@ func (linux *systemVRecord) Status() (string, error) {
 	}
 
 	if !linux.isInstalled() {
-		return "Status could not defined", ErrNotInstalled
+		return statNotInstalled, ErrNotInstalled
 	}
 
 	statusAction, _ := linux.checkRunning()
@@ -207,6 +207,17 @@ func (linux *systemVRecord) Run(e Executable) (string, error) {
 	return runAction + " completed.", nil
 }
 
+// GetTemplate - gets service config template
+func (linux *systemVRecord) GetTemplate() string {
+	return systemVConfig
+}
+
+// SetTemplate - sets service config template
+func (linux *systemVRecord) SetTemplate(tplStr string) error {
+	systemVConfig = tplStr
+	return nil
+}
+
 var systemVConfig = `#! /bin/sh
 #
 #       /etc/rc.d/init.d/{{.Name}}

daemon_linux_upstart.go

@@ -170,7 +170,7 @@ func (linux *upstartRecord) Status() (string, error) {
 	}
 
 	if !linux.isInstalled() {
-		return "Status could not defined", ErrNotInstalled
+		return statNotInstalled, ErrNotInstalled
 	}
 
 	statusAction, _ := linux.checkRunning()
@@ -185,6 +185,17 @@ func (linux *upstartRecord) Run(e Executable) (string, error) {
 	return runAction + " completed.", nil
 }
 
+// GetTemplate - gets service config template
+func (linux *upstartRecord) GetTemplate() string {
+	return upstatConfig
+}
+
+// SetTemplate - sets service config template
+func (linux *upstartRecord) SetTemplate(tplStr string) error {
+	upstatConfig = tplStr
+	return nil
+}
+
 var upstatConfig = `# {{.Name}} {{.Description}}
 
 description     "{{.Description}}"

daemon_windows.go

@@ -51,7 +51,7 @@ func (windows *windowsRecord) Install(args ...string) (string, error) {
 	s, err := m.OpenService(windows.name)
 	if err == nil {
 		s.Close()
-		return installAction + failed, err
+		return installAction + failed, ErrAlreadyRunning
 	}
 
 	s, err = m.CreateService(windows.name, execp, mgr.Config{
@@ -65,6 +65,30 @@ func (windows *windowsRecord) Install(args ...string) (string, error) {
 	}
 	defer s.Close()
 
+	// set recovery action for service
+	// restart after 5 seconds for the first 3 times
+	// restart after 1 minute, otherwise
+	r := []mgr.RecoveryAction{
+		mgr.RecoveryAction{
+			Type:  mgr.ServiceRestart,
+			Delay: 5000 * time.Millisecond,
+		},
+		mgr.RecoveryAction{
+			Type:  mgr.ServiceRestart,
+			Delay: 5000 * time.Millisecond,
+		},
+		mgr.RecoveryAction{
+			Type:  mgr.ServiceRestart,
+			Delay: 5000 * time.Millisecond,
+		},
+		mgr.RecoveryAction{
+			Type:  mgr.ServiceRestart,
+			Delay: 60000 * time.Millisecond,
+		},
+	}
+	// set reset period as a day
+	s.SetRecoveryActions(r, uint32(86400))
+
 	return installAction + " completed.", nil
 }
 
@@ -254,7 +278,7 @@ type serviceHandler struct {
 	executable Executable
 }
 
-func (sh *serviceHandler) Execute(args []string, r <-chan svc.ChangeRequest, changes chan<- svc.Status) (ssec bool, errno uint32) {
+func (sh *serviceHandler) Execute(args []string, r <-chan svc.ChangeRequest, changes chan <- svc.Status) (ssec bool, errno uint32) {
 	const cmdsAccepted = svc.AcceptStop | svc.AcceptShutdown | svc.AcceptPauseAndContinue
 	changes <- svc.Status{State: svc.StartPending}
 
@@ -265,7 +289,7 @@ func (sh *serviceHandler) Execute(args []string, r <-chan svc.ChangeRequest, cha
 	sh.executable.Start()
 	changes <- svc.Status{State: svc.Running, Accepts: cmdsAccepted}
 
-loop:
+	loop:
 	for {
 		select {
 		case <-tick:
@@ -318,3 +342,13 @@ func (windows *windowsRecord) Run(e Executable) (string, error) {
 
 	return runAction + " completed.", nil
 }
+
+// GetTemplate - gets service config template
+func (linux *windowsRecord) GetTemplate() string {
+	return ""
+}
+
+// SetTemplate - sets service config template
+func (linux *windowsRecord) SetTemplate(tplStr string) error {
+	return errors.New(fmt.Sprintf("templating is not supported for windows"))
+}

go.mod

@@ -0,0 +1,8 @@
+module github.com/takama/daemon
+
+go 1.14
+
+require (
+	github.com/robfig/cron v1.2.0
+	golang.org/x/sys v0.0.0-20200413165638-669c56c373c4
+)

go.sum

@@ -0,0 +1,4 @@
+github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
+github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
+golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 h1:opSr2sbRXk5X5/givKrrKj9HXxFpW2sdCiP8MJSKLQY=
+golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=