docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-19 21:41:31 +03:00
Code Activity

Merge pull request #8760 from jfrazelle/8745-output-log

Browse Source 
Client should use go log package.
Upstream-commit: 665cd10d59ee6ea54f64f5b8e4ca30d07f3afdb7
Component: engine
This commit is contained in:
Victor Vieux
2014-10-24 13:13:30 -07:00
parent 29e2118279 4d1b4a2f11
commit 66e2b5cf0f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/docker/client.go
View File

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

4
components/engine/docker/docker.go
View File

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