docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove setup logging from sysinit 

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-02-24 21:54:37 -08:00
parent 431d510cae
commit a64ebabdfa
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sysinit/sysinit.go
View File

@ -7,7 +7,6 @@ import (
"github.com/dotcloud/docker/execdriver" "github.com/dotcloud/docker/execdriver"
_ "github.com/dotcloud/docker/execdriver/lxc" _ "github.com/dotcloud/docker/execdriver/lxc"
_ "github.com/dotcloud/docker/execdriver/native" _ "github.com/dotcloud/docker/execdriver/native"
"io"
"io/ioutil" "io/ioutil"
"log" "log"
"os" "os"
@ -56,14 +55,9 @@ func SysInit() {
driver = flag.String("driver", "", "exec driver") driver = flag.String("driver", "", "exec driver")
pipe = flag.Int("pipe", 0, "sync pipe fd") pipe = flag.Int("pipe", 0, "sync pipe fd")
console = flag.String("console", "", "console (pty slave) path") console = flag.String("console", "", "console (pty slave) path")
logFile = flag.String("log", "", "log file path")
) )
flag.Parse() flag.Parse()
if err := setupLogging(*logFile); err != nil {
log.Fatalf("setup logging %s", err)
}
// Get env // Get env
var env []string var env []string
content, err := ioutil.ReadFile(".dockerenv") content, err := ioutil.ReadFile(".dockerenv")
@ -94,20 +88,3 @@ func SysInit() {
log.Fatal(err) 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
}