clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 15:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11965 from duglin/DEBUG

Browse Source 
Remove use of "DEBUG" env var from CLI and de-couple -D from --log-level
This commit is contained in:
Jessie Frazelle
2015-05-12 18:24:04 -07:00
parent 3985f17812 534ed8c2d4
commit 36d995a291
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/client/info.go
+1 -3
View File
@@ -3,7 +3,6 @@ package client
import (
"encoding/json"
"fmt"
"os"
"github.com/docker/docker/api/types"
flag "github.com/docker/docker/pkg/mflag"
@@ -45,9 +44,8 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
fmt.Fprintf(cli.out, "Name: %s\n", info.Name)
fmt.Fprintf(cli.out, "ID: %s\n", info.ID)
if info.Debug || os.Getenv("DEBUG") != "" {
if info.Debug {
fmt.Fprintf(cli.out, "Debug mode (server): %v\n", info.Debug)
fmt.Fprintf(cli.out, "Debug mode (client): %v\n", os.Getenv("DEBUG") != "")
fmt.Fprintf(cli.out, "File Descriptors: %d\n", info.NFd)
fmt.Fprintf(cli.out, "Goroutines: %d\n", info.NGoroutines)
fmt.Fprintf(cli.out, "System Time: %s\n", info.SystemTime)