detach wip

Author: speier

cmd/services_run.go

@@ -6,16 +6,21 @@ import (
 	"github.com/moonwalker/luna/support"
 )
 
-var svcRunCmd = &cobra.Command{
-	Use:   "run",
-	Short: "Run services",
+var (
+	detach bool
 
-	Run: func(cmd *cobra.Command, args []string) {
-		pm := support.NewPM(cfg)
-		pm.Run(args)
-	},
-}
+	svcRunCmd = &cobra.Command{
+		Use:   "run",
+		Short: "Run services",
+
+		Run: func(cmd *cobra.Command, args []string) {
+			pm := support.NewPM(cfg)
+			pm.Run(args, detach)
+		},
+	}
+)
 
 func init() {
+	svcRunCmd.Flags().BoolVarP(&detach, "detach", "d", false, "run services in the background")
 	servicesCmd.AddCommand(svcRunCmd)
 }

cmd/services_stop.go

@@ -0,0 +1,23 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/moonwalker/luna/support"
+)
+
+var (
+	svcStopCmd = &cobra.Command{
+		Use:   "stop",
+		Short: "Stop services",
+
+		Run: func(cmd *cobra.Command, args []string) {
+			pm := support.NewPM(cfg)
+			pm.Stop(args)
+		},
+	}
+)
+
+func init() {
+	servicesCmd.AddCommand(svcStopCmd)
+}

support/pm.go

@@ -12,7 +12,7 @@ import (
 )
 
 type PM struct {
-	config Config
+	config   Config
 	services []string // Specific services to run, if empty, run all from config
 }
 
@@ -22,10 +22,10 @@ func NewPM(cfg Config) *PM {
 	}
 }
 
-func (pm *PM) Run(services []string) {
+func (pm *PM) Run(services []string, detach bool) {
 	for _, s := range services {
 		hasService := false
-		for name, _ := range pm.config.Services {
+		for name := range pm.config.Services {
 			if name == s {
 				hasService = true
 			}
@@ -37,7 +37,26 @@ func (pm *PM) Run(services []string) {
 	}
 	pm.services = services
 	pm.start()
-	waitSig()
+	if !detach {
+		waitSig()
+		pm.stop()
+	}
+}
+
+func (pm *PM) Stop(services []string) {
+	for _, s := range services {
+		hasService := false
+		for name := range pm.config.Services {
+			if name == s {
+				hasService = true
+			}
+		}
+		if !hasService {
+			fmt.Println("Could not find service " + s)
+			os.Exit(1)
+		}
+	}
+	pm.services = services
 	pm.stop()
 }