removed retry logic from winsw service stopping, and removed debug statements

Signed-off-by: Anthony Emengo <[email protected]>

Author: Andy Voellmer

acceptance/privileged/cfdev_lifecycle_test.go

@@ -276,9 +276,7 @@ func streamKinesis(analyticsChan chan string) {
 		eventTime, err := time.Parse(time.RFC3339, analyticsEvent.Timestamp)
 		tenMinutesAgo := time.Now().UTC().Add(-10 * time.Minute)
 		if eventTime.After(tenMinutesAgo) {
-			fmt.Printf("DEBUG: EVENT RECEIVED: `%v` event user:`%v` current user:`%v`\n", analyticsEvent.Event, analyticsEvent.UserId, userID)
 			if analyticsEvent.UserId == userID {
-				fmt.Printf("DEBUG: Add the event `%v` to the channel!!\n", analyticsEvent.Event)
 				analyticsChan <- analyticsEvent.Event
 			}
 		}

cmd/stop/stop.go

@@ -1,7 +1,6 @@
 package stop
 
 import (
-	"fmt"
 	"runtime"
 
 	"code.cloudfoundry.org/cfdev/cfanalytics"
@@ -104,7 +103,6 @@ func (s *Stop) RunE(cmd *cobra.Command, args []string) error {
 		reterr = errors.SafeWrap(err, "failed to stop vpnkit")
 	}
 
-	fmt.Printf("DEBUG: STOP: FINISHED STOPPING & ABOUT TO DESTROY VPNKIT \n")
 	if err := s.VpnKit.Destroy(); err != nil {
 		reterr = errors.SafeWrap(err, "failed to destroy vpnkit")
 	}

daemon/winsw_windows.go

@@ -9,7 +9,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strings"
-	"time"
 )
 
 type WinSW struct {
@@ -93,16 +92,14 @@ func (w *WinSW) Start(label string) error {
 func (w *WinSW) Stop(label string) error {
 	var executablePath string
 	running, _ := w.IsRunning(label)
-	for running {
+	if running {
 		_, executablePath = getServicePaths(label, w.ServicesDir)
 
 		cmd := exec.Command(executablePath, "stop")
 		err := runCommand(cmd)
 		if err != nil {
 			return err
 		}
-		time.Sleep(4 * time.Second)
-		running, _ = w.IsRunning(label)
 	}
 	return nil
 }
@@ -177,7 +174,6 @@ func isInstalled(label string) bool {
 
 func runCommand(command *exec.Cmd) error {
 	output, err := command.CombinedOutput()
-	fmt.Printf("DEBUG: OUTPUT FROM TRYING TO STOP SERVICE: %v\n", string(output))
 	if err != nil {
 		return fmt.Errorf("Failed to execute %s, %v: %s: %s", command.Path, command.Args, err, string(output))
 	}