Merge pull request #43520 from thaJeztah/daemon_fix_hosts_validation_step1e

api/server: remove "Logging" from config

api/server/middleware.go

@@ -16,7 +16,7 @@ func (s *Server) handlerWithGlobalMiddlewares(handler httputils.APIFunc) httputi
 		next = m.WrapHandler(next)
 	}
 
-	if s.cfg.Logging && logrus.GetLevel() == logrus.DebugLevel {
+	if logrus.GetLevel() == logrus.DebugLevel {
 		next = middleware.DebugRequestMiddleware(next)
 	}
 

api/server/server.go

@@ -23,7 +23,6 @@ const versionMatcher = "/v{version:[0-9.]+}"
 
 // Config provides the configuration for the API server
 type Config struct {
-	Logging     bool
 	CorsHeaders string
 	Version     string
 	SocketGroup string

cmd/dockerd/daemon.go

@@ -569,7 +569,6 @@ func (cli *DaemonCli) getContainerdDaemonOpts() ([]supervisor.DaemonOpt, error)
 
 func newAPIServerConfig(cli *DaemonCli) (*apiserver.Config, error) {
 	serverConfig := &apiserver.Config{
-		Logging:     true,
 		SocketGroup: cli.Config.SocketGroup,
 		Version:     dockerversion.Version,
 		CorsHeaders: cli.Config.CorsHeaders,