From a64ebabdfaca66709d664cb87a35d689e35cfd0d Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 24 Feb 2014 21:54:37 -0800 Subject: [PATCH] Remove setup logging from sysinit Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) --- sysinit/sysinit.go | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/sysinit/sysinit.go b/sysinit/sysinit.go index cd74e0c88e..3f2b0b6066 100644 --- a/sysinit/sysinit.go +++ b/sysinit/sysinit.go @@ -7,7 +7,6 @@ import ( "github.com/dotcloud/docker/execdriver" _ "github.com/dotcloud/docker/execdriver/lxc" _ "github.com/dotcloud/docker/execdriver/native" - "io" "io/ioutil" "log" "os" @@ -56,14 +55,9 @@ func SysInit() { driver = flag.String("driver", "", "exec driver") pipe = flag.Int("pipe", 0, "sync pipe fd") console = flag.String("console", "", "console (pty slave) path") - logFile = flag.String("log", "", "log file path") ) flag.Parse() - if err := setupLogging(*logFile); err != nil { - log.Fatalf("setup logging %s", err) - } - // Get env var env []string content, err := ioutil.ReadFile(".dockerenv") @@ -94,20 +88,3 @@ func SysInit() { log.Fatal(err) } } - -func setupLogging(logFile string) (err error) { - var writer io.Writer - switch logFile { - case "stderr": - writer = os.Stderr - case "none", "": - writer = ioutil.Discard - default: - writer, err = os.OpenFile(logFile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0755) - if err != nil { - return err - } - } - log.SetOutput(writer) - return nil -}