Execute "up.shutdown" when exiting "okteto up" (#953)

Signed-off-by: Pablo Chico de Guzman <pchico83@gmail.com>

cmd/up/up.go

@@ -223,6 +223,7 @@ func (up *upContext) start(autoDeploy, build, resetSyncthing bool) error {
 	analytics.TrackUp(true, up.Dev.Name, up.getClusterType(), len(up.Dev.Services) == 0, up.isSwap, up.Dev.RemoteModeEnabled())
 
 	go up.activate(autoDeploy, build, resetSyncthing)
+	defer up.shutdown()
 
 	select {
 	case <-stop:

pkg/syncthing/process.go

@@ -20,7 +20,7 @@ import (
 	"strings"
 )
 
-func terminate(pid int) error {
+func terminate(pid int, wait bool) error {
 	proc := os.Process{Pid: pid}
 	if err := proc.Signal(os.Interrupt); err != nil {
 		if strings.Contains(err.Error(), "process already finished") {
@@ -30,7 +30,9 @@ func terminate(pid int) error {
 		return err
 	}
 
-	defer proc.Wait() // nolint: errcheck
+	if wait {
+		defer proc.Wait() // nolint: errcheck
+	}
 
 	return nil
 }

pkg/syncthing/process_windows.go

@@ -17,6 +17,6 @@ import (
 	"github.com/mattn/psutil"
 )
 
-func terminate(pid int) error {
+func terminate(pid int, wait bool) error {
 	return psutil.TerminateTree(pid, 0)
 }

pkg/syncthing/syncthing.go

@@ -188,7 +188,7 @@ func New(dev *model.Dev) (*Syncthing, error) {
 	return s, nil
 }
 
-func (s *Syncthing) cleanupDaemon(pid int) error {
+func (s *Syncthing) cleanupDaemon(pid int, wait bool) error {
 	process, err := ps.FindProcess(pid)
 	if process == nil && err == nil {
 		return nil
@@ -204,7 +204,7 @@ func (s *Syncthing) cleanupDaemon(pid int) error {
 		return nil
 	}
 
-	err = terminate(pid)
+	err = terminate(pid, wait)
 	if err == nil {
 		log.Infof("terminated syncthing with pid %d", pid)
 	}
@@ -590,7 +590,7 @@ func (s *Syncthing) Stop(force bool) error {
 		}
 	}
 
-	if err := s.cleanupDaemon(pid); err != nil {
+	if err := s.cleanupDaemon(pid, force); err != nil {
 		return err
 	}