Merge pull request #63 from NodeFactoryIo/hotix/socket-overflow

Fix socket daemon errors
NodeFactoryIo · Feb 23, 2021 · 99b5dc0 · 99b5dc0
2 parents 90d9487 + a4d5221
commit 99b5dc0
Show file tree

Hide file tree

Showing 7 changed files with 270 additions and 4 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-version=0.3.3
+version=0.3.4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## [v0.3.4](https://github.com/NodeFactoryIo/vedran-daemon/tree/v0.3.4)
+
+[Full Changelog](https://github.com/NodeFactoryIo/vedran-daemon/compare/v0.3.3...v0.3.4)
+
+### Fixed
+- Fix socket and request memory leaks [\#63](https://github.com/NodeFactoryIo/vedran-daemon/pull/63) ([mpetrun5](https://github.com/mpetrun5))
+
+### Added
+
+### Changed
+
 ## [v0.3.3](https://github.com/NodeFactoryIo/vedran-daemon/tree/v0.3.3)
 
 [Full Changelog](https://github.com/NodeFactoryIo/vedran-daemon/compare/v0.3.2...v0.3.3)

diff --git a/go.mod b/go.mod
@@ -3,13 +3,19 @@ module github.com/NodeFactoryIo/vedran-daemon
 go 1.15
 
 require (
-	github.com/NodeFactoryIo/vedran v0.1.2-0.20201012103221-1832974f2e38
+	github.com/NodeFactoryIo/vedran v0.5.4-0.20210223103850-bbeee18776e9
+	github.com/felixge/tcpkeepalive v0.0.0-20160804073959-5bb0b2dea91e // indirect
 	github.com/go-co-op/gocron v0.3.1
-	github.com/gorilla/websocket v1.4.0
+	github.com/golang/mock v1.3.1 // indirect
+	github.com/google/go-cmp v0.5.2 // indirect
+	github.com/gorilla/websocket v1.4.1
 	github.com/gosuri/uitable v0.0.4
+	github.com/kr/text v0.2.0 // indirect
 	github.com/mitchellh/mapstructure v1.3.3
 	github.com/prometheus/common v0.13.0
 	github.com/sirupsen/logrus v1.6.0
 	github.com/spf13/cobra v1.0.0
+	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/testify v1.6.1
+	go.etcd.io/bbolt v1.3.5 // indirect
 )
diff --git a/go.sum b/go.sum
diff --git a/internal/lb/client.go b/internal/lb/client.go
@@ -104,9 +104,9 @@ func (c *Client) do(req *http.Request, v interface{}) (*http.Response, error) {
 	} else if resp.StatusCode != 200 {
 		return nil, fmt.Errorf("Request %v returned invalid status code %d", req, resp.StatusCode)
 	}
+	defer resp.Body.Close()
 
 	if v != nil {
-		defer resp.Body.Close()
 		body, _ := ioutil.ReadAll((resp.Body))
 		err = json.Unmarshal(body, &v)
 		if err != nil {

diff --git a/internal/lb/metrics.go b/internal/lb/metrics.go
@@ -36,5 +36,6 @@ func (ms *metricsService) Send(client node.Client) (*http.Response, error) {
 		return nil, err
 	}
 
+	resp.Body.Close()
 	return resp, err
 }
diff --git a/internal/lb/ping.go b/internal/lb/ping.go
@@ -38,5 +38,6 @@ func (ps *pingService) Send() (*http.Response, error) {
 		return nil, err
 	}
 
+	resp.Body.Close()
 	return resp, err
 }