Browse code

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

Michael Crosby authored on 2014/02/25 14:54:37
Showing 1 changed files
... ...
@@ -7,7 +7,6 @@ import (
7 7
 	"github.com/dotcloud/docker/execdriver"
8 8
 	_ "github.com/dotcloud/docker/execdriver/lxc"
9 9
 	_ "github.com/dotcloud/docker/execdriver/native"
10
-	"io"
11 10
 	"io/ioutil"
12 11
 	"log"
13 12
 	"os"
... ...
@@ -56,14 +55,9 @@ func SysInit() {
56 56
 		driver     = flag.String("driver", "", "exec driver")
57 57
 		pipe       = flag.Int("pipe", 0, "sync pipe fd")
58 58
 		console    = flag.String("console", "", "console (pty slave) path")
59
-		logFile    = flag.String("log", "", "log file path")
60 59
 	)
61 60
 	flag.Parse()
62 61
 
63
-	if err := setupLogging(*logFile); err != nil {
64
-		log.Fatalf("setup logging %s", err)
65
-	}
66
-
67 62
 	// Get env
68 63
 	var env []string
69 64
 	content, err := ioutil.ReadFile(".dockerenv")
... ...
@@ -94,20 +88,3 @@ func SysInit() {
94 94
 		log.Fatal(err)
95 95
 	}
96 96
 }
97
-
98
-func setupLogging(logFile string) (err error) {
99
-	var writer io.Writer
100
-	switch logFile {
101
-	case "stderr":
102
-		writer = os.Stderr
103
-	case "none", "":
104
-		writer = ioutil.Discard
105
-	default:
106
-		writer, err = os.OpenFile(logFile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0755)
107
-		if err != nil {
108
-			return err
109
-		}
110
-	}
111
-	log.SetOutput(writer)
112
-	return nil
113
-}