From ae99a88f52b4ddb260818a8ba80a28f650233894 Mon Sep 17 00:00:00 2001
From: mzack <marco.rivoli.nvh@gmail.com>
Date: Tue, 19 Oct 2021 19:39:33 +0200
Subject: [PATCH] timer.after => timer

---
 v2/pkg/protocols/network/request.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/v2/pkg/protocols/network/request.go b/v2/pkg/protocols/network/request.go
index a1425eba..6beecc6e 100644
--- a/v2/pkg/protocols/network/request.go
+++ b/v2/pkg/protocols/network/request.go
@@ -198,17 +198,25 @@ func (request *Request) executeRequestWithPayloads(actualAddress, address, input
 	)
 
 	if request.ReadAll {
-		readInterval := time.After(time.Second * 1)
+		readInterval := time.NewTimer(time.Second * 1)
+		// stop the timer and drain the channel
+		closeTimer := func(t *time.Timer) {
+			if !t.Stop() {
+				<-t.C
+			}
+		}
 	read_socket:
 		for {
 			select {
-			case <-readInterval:
+			case <-readInterval.C:
+				closeTimer(readInterval)
 				break read_socket
 			default:
 				buf := make([]byte, bufferSize)
 				nBuf, err := conn.Read(buf)
 				if err != nil && !os.IsTimeout(err) {
 					request.options.Output.Request(request.options.TemplateID, address, "network", err)
+					closeTimer(readInterval)
 					return errors.Wrap(err, "could not read from server")
 				}
 				responseBuilder.Write(buf[:nBuf])