add link between -D and --log-level=debug back in
Due to popular demand :-) See #11965 Signed-off-by: Doug Davis <dug@us.ibm.com>
This commit is contained in:
parent
ac81cd1fc3
commit
a85ca8b7c4
|
@ -56,6 +56,7 @@ func main() {
|
||||||
|
|
||||||
if *flDebug {
|
if *flDebug {
|
||||||
os.Setenv("DEBUG", "1")
|
os.Setenv("DEBUG", "1")
|
||||||
|
setLogLevel(logrus.DebugLevel)
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(flHosts) == 0 {
|
if len(flHosts) == 0 {
|
||||||
|
|
|
@ -232,8 +232,8 @@ func (s *DockerDaemonSuite) TestDaemonFlagD(c *check.C) {
|
||||||
c.Fatal(err)
|
c.Fatal(err)
|
||||||
}
|
}
|
||||||
content, _ := ioutil.ReadFile(s.d.logFile.Name())
|
content, _ := ioutil.ReadFile(s.d.logFile.Name())
|
||||||
if strings.Contains(string(content), `level=debug`) {
|
if !strings.Contains(string(content), `level=debug`) {
|
||||||
c.Fatalf(`Should not have level="debug" in log file using -D:\n%s`, string(content))
|
c.Fatalf(`Should have level="debug" in log file using -D:\n%s`, string(content))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -242,8 +242,8 @@ func (s *DockerDaemonSuite) TestDaemonFlagDebug(c *check.C) {
|
||||||
c.Fatal(err)
|
c.Fatal(err)
|
||||||
}
|
}
|
||||||
content, _ := ioutil.ReadFile(s.d.logFile.Name())
|
content, _ := ioutil.ReadFile(s.d.logFile.Name())
|
||||||
if strings.Contains(string(content), `level=debug`) {
|
if !strings.Contains(string(content), `level=debug`) {
|
||||||
c.Fatalf(`Should not have level="debug" in log file using --debug:\n%s`, string(content))
|
c.Fatalf(`Should have level="debug" in log file using --debug:\n%s`, string(content))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -252,8 +252,8 @@ func (s *DockerDaemonSuite) TestDaemonFlagDebugLogLevelFatal(c *check.C) {
|
||||||
c.Fatal(err)
|
c.Fatal(err)
|
||||||
}
|
}
|
||||||
content, _ := ioutil.ReadFile(s.d.logFile.Name())
|
content, _ := ioutil.ReadFile(s.d.logFile.Name())
|
||||||
if strings.Contains(string(content), `level=debug`) {
|
if !strings.Contains(string(content), `level=debug`) {
|
||||||
c.Fatalf(`Should not have level="debug" in log file when using both --debug and --log-level=fatal:\n%s`, string(content))
|
c.Fatalf(`Should have level="debug" in log file when using both --debug and --log-level=fatal:\n%s`, string(content))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue