From 4a9000d22e3b902db0099e4ff21ce0ef6d3739ca Mon Sep 17 00:00:00 2001 From: Ice3man Date: Tue, 1 Mar 2022 16:24:02 +0530 Subject: [PATCH] Fixed network response error + timeout handling --- v2/pkg/protocols/network/request.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/pkg/protocols/network/request.go b/v2/pkg/protocols/network/request.go index 53f9254ac..decc287d3 100644 --- a/v2/pkg/protocols/network/request.go +++ b/v2/pkg/protocols/network/request.go @@ -53,7 +53,7 @@ func (request *Request) ExecuteWithResults(input string, metadata /*TODO review actualAddress := replacer.Replace(kv.address, variables) if err := request.executeAddress(variables, actualAddress, address, input, kv.tls, previous, callback); err != nil { - gologger.Verbose().Label("ERR").Msgf("Could not make network request for %s: %s\n", actualAddress, err) + gologger.Warning().Msgf("Could not make network request for %s: %s\n", actualAddress, err) continue } } @@ -223,7 +223,7 @@ func (request *Request) executeRequestWithPayloads(variables map[string]interfac default: buf := make([]byte, bufferSize) nBuf, err := conn.Read(buf) - if err != nil && !os.IsTimeout(err) { + if err != nil && !os.IsTimeout(err) && err != io.EOF { request.options.Output.Request(request.options.TemplatePath, address, request.Type().String(), err) closeTimer(readInterval) return errors.Wrap(err, "could not read from server") @@ -236,7 +236,7 @@ func (request *Request) executeRequestWithPayloads(variables map[string]interfac } else { final = make([]byte, bufferSize) n, err = conn.Read(final) - if err != nil && err != io.EOF { + if err != nil && !os.IsTimeout(err) && err != io.EOF { request.options.Output.Request(request.options.TemplatePath, address, request.Type().String(), err) return errors.Wrap(err, "could not read from server") }