github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

reset buffer after use (#4279) (#4330)

pull/4343/head
Brian Downs 2021-10-26 17:58:19 -07:00 committed by GitHub
parent 174b3881a2
commit c5a9154538
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cluster/bootstrap.go
View File

@ -243,7 +243,6 @@ RETRY:
} }
files := make(bootstrap.PathsDataformat) files := make(bootstrap.PathsDataformat)
if err := json.NewDecoder(buf).Decode(&files); err != nil { if err := json.NewDecoder(buf).Decode(&files); err != nil {
// This will fail if data is being pulled from old an cluster since // This will fail if data is being pulled from old an cluster since
// older clusters used a map[string][]byte for the data structure. // older clusters used a map[string][]byte for the data structure.
@ -254,6 +253,7 @@ RETRY:
return err return err
} }
} }
buf.Seek(0, 0)
type update struct { type update struct {
db, disk, conflict bool db, disk, conflict bool

3
pkg/cluster/https.go
View File

@ -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 // Create a HTTP server with the registered request handlers, using logrus for logging
server := http.Server{ server := http.Server{
Handler: handler} Handler: handler,
}
if logrus.IsLevelEnabled(logrus.DebugLevel) { if logrus.IsLevelEnabled(logrus.DebugLevel) {
server.ErrorLog = log.New(logrus.StandardLogger().Writer(), "Cluster-Http-Server ", log.LstdFlags) server.ErrorLog = log.New(logrus.StandardLogger().Writer(), "Cluster-Http-Server ", log.LstdFlags)