From 6ec8d40ae78e73b42b6613f6e065004e4ad59d7c Mon Sep 17 00:00:00 2001 From: Marius Sturm Date: Sat, 15 Aug 2015 18:06:03 +0200 Subject: [PATCH] Initialize LogConfig in daemon mode Signed-off-by: Marius Sturm (cherry picked from commit e904cbec03654765d65a29d6709d84ee43c7bde8) Conflicts: docker/daemon.go --- docker/daemon.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docker/daemon.go b/docker/daemon.go index a1c7dafa4..1017fede4 100644 --- a/docker/daemon.go +++ b/docker/daemon.go @@ -76,6 +76,7 @@ func NewDaemonCli() *DaemonCli { // TODO(tiborvass): remove InstallFlags? daemonConfig := new(daemon.Config) + daemonConfig.LogConfig.Config = make(map[string]string) daemonConfig.InstallFlags(daemonFlags, presentInHelp) daemonConfig.InstallFlags(flag.CommandLine, absentFromHelp) registryOptions := new(registry.Options) @@ -208,10 +209,6 @@ func (cli *DaemonCli) CmdDaemon(args ...string) error { }() } - if cli.LogConfig.Config == nil { - cli.LogConfig.Config = make(map[string]string) - } - serverConfig := &apiserver.ServerConfig{ Logging: true, EnableCors: cli.EnableCors,