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

Client should use go log package. 

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
This commit is contained in:
Jessica Frazelle 2014-10-24 11:04:54 -07:00
parent c6f242b88f
commit a7aedca4a1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/client.go
View File

@ -3,7 +3,7 @@
package main package main
import ( import (
"github.com/docker/docker/pkg/log" "log" // see gh#8745, client needs to use go log pkg
) )
const CanDaemon = false const CanDaemon = false

4
docker/docker.go
View File

@ -5,13 +5,13 @@ import (
"crypto/x509" "crypto/x509"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"log" // see gh#8745, client needs to use go log pkg
"os" "os"
"strings" "strings"
"github.com/docker/docker/api" "github.com/docker/docker/api"
"github.com/docker/docker/api/client" "github.com/docker/docker/api/client"
"github.com/docker/docker/dockerversion" "github.com/docker/docker/dockerversion"
"github.com/docker/docker/pkg/log"
flag "github.com/docker/docker/pkg/mflag" flag "github.com/docker/docker/pkg/mflag"
"github.com/docker/docker/reexec" "github.com/docker/docker/reexec"
"github.com/docker/docker/utils" "github.com/docker/docker/utils"
@ -106,7 +106,7 @@ func main() {
if err := cli.Cmd(flag.Args()...); err != nil { if err := cli.Cmd(flag.Args()...); err != nil {
if sterr, ok := err.(*utils.StatusError); ok { if sterr, ok := err.(*utils.StatusError); ok {
if sterr.Status != "" { if sterr.Status != "" {
log.Infof("%s", sterr.Status) log.Println("%s", sterr.Status)
} }
os.Exit(sterr.StatusCode) os.Exit(sterr.StatusCode)
} }