Переглянути джерело

Remove setup logging from sysinit
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)

Michael Crosby 11 роки тому
батько
коміт
a64ebabdfa
1 змінених файлів з 0 додано та 23 видалено
  1. 0 23
      sysinit/sysinit.go

+ 0 - 23
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
-}