Fix local runtime updates (#1543)

runtime/service.go

@@ -100,6 +100,7 @@ func (s *service) Start() error {
 	// reset
 	s.err = nil
 	s.closed = make(chan bool)
+	s.retries = 0
 
 	if s.Metadata == nil {
 		s.Metadata = make(map[string]string)
@@ -113,6 +114,7 @@ func (s *service) Start() error {
 	if logger.V(logger.DebugLevel, logger.DefaultLogger) {
 		logger.Debugf("Runtime service %s forking new process", s.Service.Name)
 	}
+
 	p, err := s.Process.Fork(s.Exec)
 	if err != nil {
 		s.Metadata["status"] = "error"
@@ -150,6 +152,7 @@ func (s *service) Stop() error {
 	default:
 		close(s.closed)
 		s.running = false
+		s.retries = 0
 		if s.PID == nil {
 			return nil
 		}
@@ -159,6 +162,9 @@ func (s *service) Stop() error {
 
 		// kill the process
 		err := s.Process.Kill(s.PID)
+		if err != nil {
+			return err
+		}
 		// wait for it to exit
 		s.Process.Wait(s.PID)