mirror of
https://git.vectorsigma.ru/public/k3s.git
synced 2026-07-29 00:39:30 +00:00
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user