New version of kardianos/service

vendor/github.com/kardianos/service/.travis.yml

@@ -1,3 +1,6 @@
+arch:
+  - ppc64le
+  - amd64
 language: go
 go_import_path: github.com/kardianos/service
 sudo: required

vendor/github.com/kardianos/service/go.mod

@@ -2,4 +2,4 @@ module github.com/kardianos/service
 
 go 1.12
 
-require golang.org/x/sys v0.0.0-20190204203706-41f3e6584952
+require golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211

vendor/github.com/kardianos/service/go.sum

@@ -1,2 +1,2 @@
-golang.org/x/sys v0.0.0-20190204203706-41f3e6584952 h1:FDfvYgoVsA7TTZSbgiqjAbfPbK47CNHdWl3h/PJtii0=
-golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211 h1:9UQO31fZ+0aKQOFldThf7BKPMJTiBfWycGh/u3UoO88=
+golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

vendor/github.com/kardianos/service/service.go

@@ -80,12 +80,12 @@ const (
 	optionPrefix               = "Prefix"
 	optionPrefixDefault        = "application"
 
-	optionRunWait      = "RunWait"
-	optionReloadSignal = "ReloadSignal"
-	optionPIDFile      = "PIDFile"
+	optionRunWait            = "RunWait"
+	optionReloadSignal       = "ReloadSignal"
+	optionPIDFile            = "PIDFile"
 	optionLimitNOFILE        = "LimitNOFILE"
 	optionLimitNOFILEDefault = -1 // -1 = don't set in configuration
-	optionRestart      = "Restart"
+	optionRestart            = "Restart"
 
 	optionSuccessExitStatus = "SuccessExitStatus"
 
@@ -151,6 +151,8 @@ type Config struct {
 	//                                                in addition to the default ones.
 	//  * Linux (systemd)
 	//    - LimitNOFILE	 int - Maximum open files (ulimit -n) (https://serverfault.com/questions/628610/increasing-nproc-for-processes-launched-by-systemd-on-centos-7)
+	//  * Windows
+	//    - DelayedAutoStart  bool (false) - after booting start this service after some delay
 
 	Option KeyValue
 }
@@ -326,6 +328,16 @@ type Interface interface {
 	Stop(s Service) error
 }
 
+// Shutdowner represents a service interface for a program that differentiates between "stop" and
+// "shutdown". A shutdown is triggered when the whole box (not just the service) is stopped.
+type Shutdowner interface {
+	Interface
+	// Shutdown provides a place to clean up program execution when the system is being shutdown.
+	// It is essentially the same as Stop but for the case where machine is being shutdown/restarted
+	// instead of just normally stopping the service. Stop won't be called when Shutdown is.
+	Shutdown(s Service) error
+}
+
 // TODO: Add Configure to Service interface.
 
 // Service represents a service that can be run or controlled.

vendor/github.com/kardianos/service/service_aix.go

@@ -1,3 +1,5 @@
+//+build aix
+
 // Copyright 2015 Daniel Theophanes.
 // Use of this source code is governed by a zlib-style
 // license that can be found in the LICENSE file.
@@ -49,7 +51,7 @@ func getPidOfSvcMaster() int {
 	cmd.Stdout = &out
 	pid := 0
 	if err := cmd.Run(); err == nil {
-		matches := pat.FindAllStringSubmatch(out.String(),-1)
+		matches := pat.FindAllStringSubmatch(out.String(), -1)
 		for _, match := range matches {
 			pid, _ = strconv.Atoi(match[1])
 			break
@@ -123,7 +125,7 @@ func (s *aixService) Install() error {
 	if err != nil {
 		return err
 	}
-	err = run("mkssys", "-s", s.Name, "-p", path, "-u", "0", "-R", "-Q", "-S", "-n", "15", "-f", "9", "-d", "-w", "30" )
+	err = run("mkssys", "-s", s.Name, "-p", path, "-u", "0", "-R", "-Q", "-S", "-n", "15", "-f", "9", "-d", "-w", "30")
 	if err != nil {
 		return err
 	}

vendor/github.com/kardianos/service/service_darwin.go

@@ -160,9 +160,8 @@ func (s *darwinLaunchdService) Install() error {
 
 		KeepAlive, RunAtLoad bool
 		SessionCreate        bool
-		StandardOut bool
-		StandardError bool
-		
+		StandardOut          bool
+		StandardError        bool
 	}{
 		Config:        s.Config,
 		Path:          path,

vendor/github.com/kardianos/service/service_linux.go

@@ -6,6 +6,8 @@ package service
 
 import (
 	"bufio"
+	"fmt"
+	"io/ioutil"
 	"os"
 	"strings"
 )
@@ -63,13 +65,37 @@ func init() {
 	)
 }
 
+func binaryName(pid int) (string, error) {
+	statPath := fmt.Sprintf("/proc/%d/stat", pid)
+	dataBytes, err := ioutil.ReadFile(statPath)
+	if err != nil {
+		return "", err
+	}
+
+	// First, parse out the image name
+	data := string(dataBytes)
+	binStart := strings.IndexRune(data, '(') + 1
+	binEnd := strings.IndexRune(data[binStart:], ')')
+	return data[binStart : binStart+binEnd], nil
+}
+
 func isInteractive() (bool, error) {
-	// TODO: This is not true for user services.
 	inContainer, err := isInContainer(cgroupFile)
 	if err != nil {
 		return false, err
 	}
-	return os.Getppid() != 1 || inContainer, nil
+
+	if inContainer {
+		return true, nil
+	}
+
+	ppid := os.Getppid()
+	if ppid == 1 {
+		return false, nil
+	}
+
+	binary, _ := binaryName(ppid)
+	return binary != "systemd", nil
 }
 
 // isInContainer checks if the service is being executed in docker or lxc

vendor/github.com/kardianos/service/service_solaris.go

@@ -134,9 +134,9 @@ func (s *solarisService) Install() error {
 	}
 	var to = &struct {
 		*Config
-		Prefix string
+		Prefix  string
 		Display string
-		Path string
+		Path    string
 	}{
 		s.Config,
 		s.Prefix,
@@ -150,7 +150,7 @@ func (s *solarisService) Install() error {
 	}
 
 	// import service
-	err = run("svcadm", "restart", "manifest-import" )
+	err = run("svcadm", "restart", "manifest-import")
 	if err != nil {
 		return err
 	}
@@ -171,7 +171,7 @@ func (s *solarisService) Uninstall() error {
 	}
 
 	// unregister service
-	err = run("svcadm", "restart", "manifest-import" )
+	err = run("svcadm", "restart", "manifest-import")
 	if err != nil {
 		return err
 	}

vendor/github.com/kardianos/service/service_systemd_linux.go

@@ -68,7 +68,7 @@ func (s *systemd) Platform() string {
 }
 
 func (s *systemd) configPath() (cp string, err error) {
-	if !s.Option.bool(optionUserService, optionUserServiceDefault) {
+	if !s.isUserService() {
 		cp = "/etc/systemd/system/" + s.Config.Name + ".service"
 		return
 	}
@@ -81,7 +81,7 @@ func (s *systemd) configPath() (cp string, err error) {
 	if err != nil {
 		return
 	}
-	cp = filepath.Join(systemdUserDir, s.Config.Name + ".service")
+	cp = filepath.Join(systemdUserDir, s.Config.Name+".service")
 	return
 }
 
@@ -129,6 +129,10 @@ func (s *systemd) template() *template.Template {
 	}
 }
 
+func (s *systemd) isUserService() bool {
+	return s.Option.bool(optionUserService, optionUserServiceDefault)
+}
+
 func (s *systemd) Install() error {
 	confPath, err := s.configPath()
 	if err != nil {
@@ -177,30 +181,16 @@ func (s *systemd) Install() error {
 		return err
 	}
 
-	if s.Option.bool(optionUserService, optionUserServiceDefault) {
-		err = run("systemctl", "enable", "--user", s.Name+".service")
-	} else {
-		err = run("systemctl", "enable", s.Name+".service")
-	}
+	err = s.runAction("enable")
 	if err != nil {
 		return err
 	}
 
-	if s.Option.bool(optionUserService, optionUserServiceDefault) {
-		err = run("systemctl", "daemon-reload", "--user")
-	} else {
-		err = run("systemctl", "daemon-reload")
-	}
-	return err
+	return s.run("daemon-reload")
 }
 
 func (s *systemd) Uninstall() error {
-	var err error
-	if s.Option.bool(optionUserService, optionUserServiceDefault) {
-		err = run("systemctl", "disable", "--user", s.Name+".service")
-	} else {
-		err = run("systemctl", "disable", s.Name+".service")
-	}
+	err := s.runAction("disable")
 	if err != nil {
 		return err
 	}
@@ -249,7 +239,17 @@ func (s *systemd) Status() (Status, error) {
 	case strings.HasPrefix(out, "active"):
 		return StatusRunning, nil
 	case strings.HasPrefix(out, "inactive"):
-		return StatusStopped, nil
+		// inactive can also mean its not installed, check unit files
+		exitCode, out, err := runWithOutput("systemctl", "list-unit-files", "-t", "service", s.Name)
+		if exitCode == 0 && err != nil {
+			return StatusUnknown, err
+		}
+		if strings.Contains(out, s.Name) {
+			// unit file exists, installed but not running
+			return StatusStopped, nil
+		}
+		// no unit file
+		return StatusUnknown, ErrNotInstalled
 	case strings.HasPrefix(out, "activating"):
 		return StatusRunning, nil
 	case strings.HasPrefix(out, "failed"):
@@ -260,15 +260,26 @@ func (s *systemd) Status() (Status, error) {
 }
 
 func (s *systemd) Start() error {
-	return run("systemctl", "start", s.Name+".service")
+	return s.runAction("start")
 }
 
 func (s *systemd) Stop() error {
-	return run("systemctl", "stop", s.Name+".service")
+	return s.runAction("stop")
 }
 
 func (s *systemd) Restart() error {
-	return run("systemctl", "restart", s.Name+".service")
+	return s.runAction("restart")
+}
+
+func (s *systemd) run(action string, args ...string) error {
+	if s.isUserService() {
+		return run("systemctl", append([]string{action, "--user"}, args...)...)
+	}
+	return run("systemctl", append([]string{action}, args...)...)
+}
+
+func (s *systemd) runAction(action string) error {
+	return s.run(action, s.Name+".service")
 }
 
 const systemdScript = `[Unit]

vendor/github.com/kardianos/service/service_windows.go

@@ -176,13 +176,26 @@ loop:
 		switch c.Cmd {
 		case svc.Interrogate:
 			changes <- c.CurrentStatus
-		case svc.Stop, svc.Shutdown:
+		case svc.Stop:
 			changes <- svc.Status{State: svc.StopPending}
 			if err := ws.i.Stop(ws); err != nil {
 				ws.setError(err)
 				return true, 2
 			}
 			break loop
+		case svc.Shutdown:
+			changes <- svc.Status{State: svc.StopPending}
+			var err error
+			if wsShutdown, ok := ws.i.(Shutdowner); ok {
+				err = wsShutdown.Shutdown(ws)
+			} else {
+				err = ws.i.Stop(ws)
+			}
+			if err != nil {
+				ws.setError(err)
+				return true, 2
+			}
+			break loop
 		default:
 			continue loop
 		}
@@ -214,6 +227,7 @@ func (ws *windowsService) Install() error {
 		ServiceStartName: ws.UserName,
 		Password:         ws.Option.string("Password", ""),
 		Dependencies:     ws.Dependencies,
+		DelayedAutoStart: ws.Option.bool("DelayedAutoStart", false),
 	}, ws.Arguments...)
 	if err != nil {
 		return err