fix memory leak caused by time.Timer

externalcmd/externalcmd.go

@@ -46,35 +46,34 @@ func (e *ExternalCmd) run() {
 	defer close(e.done)
 
 	for {
-		if !e.runInner() {
+		ok := func() bool {
+			ok := e.runInner()
+			if !ok {
+				return false
+			}
+
+			if !e.restart {
+				<-e.terminate
+				return false
+			}
+
+			t := time.NewTimer(restartPause)
+			defer t.Stop()
+
+			select {
+			case <-t.C:
+				return true
+			case <-e.terminate:
+				return false
+			}
+		}()
+		if !ok {
 			break
 		}
 	}
 }
 
 func (e *ExternalCmd) runInner() bool {
-	ok := e.runInnerInner()
-	if !ok {
-		return false
-	}
-
-	if !e.restart {
-		<-e.terminate
-		return false
-	}
-
-	t := time.NewTimer(restartPause)
-	defer t.Stop()
-
-	select {
-	case <-t.C:
-		return true
-	case <-e.terminate:
-		return false
-	}
-}
-
-func (e *ExternalCmd) runInnerInner() bool {
 	var cmd *exec.Cmd
 	if runtime.GOOS == "windows" {
 		// on Windows the shell is not used and command is started directly

sourcertmp/source.go

@@ -123,20 +123,25 @@ outer:
 func (s *Source) runInner() {
 	defer close(s.innerDone)
 
-outer:
 	for {
-		ok := s.runInnerInner()
+		ok := func() bool {
-		if !ok {
+			ok := s.runInnerInner()
-			break outer
+			if !ok {
-		}
+				return false
+			}
 
-		t := time.NewTimer(retryInterval)
+			t := time.NewTimer(retryInterval)
-		defer t.Stop()
+			defer t.Stop()
 
-		select {
+			select {
-		case <-s.innerTerminate:
+			case <-t.C:
-			break outer
+				return true
-		case <-t.C:
+			case <-s.innerTerminate:
+				return false
+			}
+		}()
+		if !ok {
+			break
 		}
 	}
 }
@@ -209,6 +214,7 @@ func (s *Source) runInnerInner() bool {
 	}()
 
 	timer := time.NewTimer(5 * time.Second)
+	defer timer.Stop()
 
 	select {
 	case <-confDone:

sourcertsp/source.go

@@ -127,20 +127,25 @@ outer:
 func (s *Source) runInner() {
 	defer close(s.innerDone)
 
-outer:
 	for {
-		ok := s.runInnerInner()
+		ok := func() bool {
-		if !ok {
+			ok := s.runInnerInner()
-			break outer
+			if !ok {
-		}
+				return false
+			}
 
-		t := time.NewTimer(retryInterval)
+			t := time.NewTimer(retryInterval)
-		defer t.Stop()
+			defer t.Stop()
 
-		select {
+			select {
-		case <-s.innerTerminate:
+			case <-t.C:
-			break outer
+				return true
-		case <-t.C:
+			case <-s.innerTerminate:
+				return false
+			}
+		}()
+		if !ok {
+			break
 		}
 	}
 }