Use single cerberus binary for multiple services

Author: snmed

cerberus.go

@@ -8,6 +8,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"github.com/go-sharp/windows/pkg/ps"
 	"golang.org/x/sys/windows/registry"
@@ -67,6 +68,7 @@ func InstallService(config SvcConfig) error {
 }
 
 // RemoveService removes the service with the given name.
+// Stops the service first, can return a timeout error if it can't stop the service.
 func RemoveService(name string) error {
 	DebugLogger.Println("Open connection to service control manager...")
 	manager, err := mgr.Connect()
@@ -88,6 +90,19 @@ func RemoveService(name string) error {
 	}
 	defer s.Close()
 
+	DebugLogger.Printf("Stopping service %v...\n", config.Name)
+	s.Control(svc.Stop)
+	timeout := time.Now().Add(30 * time.Second)
+	state, _ := s.Query()
+	for state.State != svc.Stopped {
+		if time.Now().After(timeout) {
+			return newError(ErrTimeout, "failed to stop service")
+		}
+
+		time.Sleep(200 * time.Millisecond)
+		state, _ = s.Query()
+	}
+
 	Logger.Printf("Removing service %v...\n", config.Name)
 	DebugLogger.Printf("Mark service %v for deletion...", config.Name)
 	if err := s.Delete(); err != nil {
@@ -253,7 +268,7 @@ loop:
 	return
 }
 
-const swRegBaseKey = "SOFTWARE\\go-sharp\\cerberus"
+const swRegBaseKey = "SOFTWARE\\go-sharp\\cerberus\\services"
 
 // RemoveServiceCfg removes the service configuration form the cerberus service db.
 // It returns a generic error if call fails.

cmd/main.go

@@ -86,10 +86,18 @@ func (r *ListCommand) Execute(args []string) (err error) {
 		cerberus.DebugLogger.Fatalln(err)
 	}
 
+	fmt.Printf("\nCerberus installed services:\n")
+	fmt.Println(strings.Repeat("-", 80))
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
-	fmt.Fprintf(w, "\nName\tDisplay Name\tDescription\tWorking Dir\tArgs\tEnvironment\n")
 	for _, s := range svcs {
-		fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\n", s.Name, s.DisplayName, s.Desc, s.WorkDir, strings.Join(s.Args, " "), strings.Join(s.Env, " "))
+		fmt.Fprintf(w, "Name:\t%v\n", s.Name)
+		fmt.Fprintf(w, "Display Name:\t%v\n", s.DisplayName)
+		fmt.Fprintf(w, "Description:\t%v\n", s.Desc)
+		fmt.Fprintf(w, "Executable Path:\t%v\n", s.ExePath)
+		fmt.Fprintf(w, "Working Directory:\t%v\n", s.WorkDir)
+		fmt.Fprintf(w, "Arguments:\t%v\n", strings.Join(s.Args, " "))
+		fmt.Fprintf(w, "Environment Variables:\t%v\n", strings.Join(s.Env, " "))
+		fmt.Fprintf(w, "%v\n", strings.Repeat("-", 80))
 	}
 	w.Flush()
 
@@ -135,7 +143,9 @@ func (i *InstallCommand) Execute(args []string) (err error) {
 // RemoveCommand used to remove a service.
 type RemoveCommand struct {
 	RootCommand
-	Name string `long:"name" short:"n" description:"Try to remove service by name" required:"yes"`
+	Args struct {
+		Name string `positional-arg-name:"SERVICE_NAME" description:"Name of the service to remove." required:"yes"`
+	} `positional-args:"yes" required:"1"`
 }
 
 // Execute will remove an installed service. The args parameter is not used
@@ -145,7 +155,7 @@ func (r *RemoveCommand) Execute(args []string) error {
 		cerberus.Logger.Fatalln(err)
 	}
 
-	if err := cerberus.RemoveService(r.Name); err != nil {
+	if err := cerberus.RemoveService(r.Args.Name); err != nil {
 		cerberus.Logger.Fatalln(err)
 	}
 
@@ -156,7 +166,7 @@ func (r *RemoveCommand) Execute(args []string) error {
 type RunCommand struct {
 	RootCommand
 	Args struct {
-		Name string `positional-arg-name:"SERVICE_NAME" description:"Name of the service to remove."`
+		Name string `positional-arg-name:"SERVICE_NAME" description:"Name of the service to run."`
 	} `positional-args:"yes" required:"1"`
 }
 

error.go

@@ -22,10 +22,11 @@ const (
 	ErrRemoveService
 	// ErrRunService indicates error while running a service.
 	ErrRunService
+	// ErrTimeout indicates an action run into a timeout.
+	ErrTimeout
 )
 
 var errorMap = map[ErrorCode]string{
-	ErrGeneric:        "",
 	ErrSaveServiceCfg: "SaveServiceCfg",
 	ErrLoadServiceCfg: "LoadServiceCfg",
 	ErrInstallService: "InstallService",
@@ -61,7 +62,11 @@ func (e Error) Unwrap(err error) error {
 
 // Error implements the error interface.
 func (e Error) Error() string {
-	err := fmt.Sprintf("%v: %v", errorMap[e.Code], e.Message)
+	err := e.Message
+	if v, ok := errorMap[e.Code]; ok && v != "" {
+		err = fmt.Sprintf("(%v) %v", v, e.Message)
+	}
+
 	if e.nestedErr != nil {
 		err = fmt.Sprintf("%v: %v", err, e.nestedErr)
 	}