From c5a915453822c24e0117d9cef4bf69161aba4aed Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Tue, 26 Oct 2021 17:58:19 -0700 Subject: [PATCH] reset buffer after use (#4279) (#4330) --- pkg/cluster/bootstrap.go | 2 +- pkg/cluster/https.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/cluster/bootstrap.go b/pkg/cluster/bootstrap.go index c579842647..76cc290cab 100644 --- a/pkg/cluster/bootstrap.go +++ b/pkg/cluster/bootstrap.go @@ -243,7 +243,6 @@ RETRY: } files := make(bootstrap.PathsDataformat) - if err := json.NewDecoder(buf).Decode(&files); err != nil { // This will fail if data is being pulled from old an cluster since // older clusters used a map[string][]byte for the data structure. @@ -254,6 +253,7 @@ RETRY: return err } } + buf.Seek(0, 0) type update struct { db, disk, conflict bool diff --git a/pkg/cluster/https.go b/pkg/cluster/https.go index 5f14f5c2c1..3b6588f63e 100644 --- a/pkg/cluster/https.go +++ b/pkg/cluster/https.go @@ -79,7 +79,8 @@ func (c *Cluster) initClusterAndHTTPS(ctx context.Context) error { // Create a HTTP server with the registered request handlers, using logrus for logging server := http.Server{ - Handler: handler} + Handler: handler, + } if logrus.IsLevelEnabled(logrus.DebugLevel) { server.ErrorLog = log.New(logrus.StandardLogger().Writer(), "Cluster-Http-Server ", log.LstdFlags)