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

Use utils.Debugf instead of log.* 

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2014-06-06 10:47:13 -07:00 committed by Solomon Hykes
parent 50fdeb063c
commit 9e034af324
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backends/forward.go
View File

@ -8,7 +8,6 @@ import (
"github.com/dotcloud/docker/utils" "github.com/dotcloud/docker/utils"
"io" "io"
"io/ioutil" "io/ioutil"
"log"
"net" "net"
"net/http" "net/http"
"net/http/httputil" "net/http/httputil"
@ -238,33 +237,33 @@ func (c *client) hijack(method, path string, in io.ReadCloser, stdout, stderr io
} }
}() }()
_, err = utils.StdCopy(stdout, stderr, br) _, err = utils.StdCopy(stdout, stderr, br)
log.Println("[hijack] End of stdout") utils.Debugf("[hijack] End of stdout")
return err return err
}) })
sendStdin := utils.Go(func() error { sendStdin := utils.Go(func() error {
if in != nil { if in != nil {
io.Copy(rwc, in) io.Copy(rwc, in)
log.Println("[hijack] End of stdin") utils.Debugf("[hijack] End of stdin")
} }
if tcpc, ok := rwc.(*net.TCPConn); ok { if tcpc, ok := rwc.(*net.TCPConn); ok {
if err := tcpc.CloseWrite(); err != nil { if err := tcpc.CloseWrite(); err != nil {
log.Printf("Couldn't send EOF: %s\n", err) utils.Debugf("Couldn't send EOF: %s", err)
} }
} else if unixc, ok := rwc.(*net.UnixConn); ok { } else if unixc, ok := rwc.(*net.UnixConn); ok {
if err := unixc.CloseWrite(); err != nil { if err := unixc.CloseWrite(); err != nil {
log.Printf("Couldn't send EOF: %s\n", err) utils.Debugf("Couldn't send EOF: %s", err)
} }
} }
// Discard errors due to pipe interruption // Discard errors due to pipe interruption
return nil return nil
}) })
if err := <-receiveStdout; err != nil { if err := <-receiveStdout; err != nil {
log.Printf("Error receiveStdout: %s\n", err) utils.Debugf("Error receiveStdout: %s", err)
return err return err
} }
if err := <-sendStdin; err != nil { if err := <-sendStdin; err != nil {
log.Printf("Error sendStdin: %s\n", err) utils.Debugf("Error sendStdin: %s", err)
return err return err
} }
return nil return nil

12
dockerclient/dockerclient.go
View File

@ -7,8 +7,8 @@ import (
"github.com/docker/libswarm/backends" "github.com/docker/libswarm/backends"
"github.com/docker/libswarm/beam" "github.com/docker/libswarm/beam"
"github.com/dotcloud/docker/runconfig" "github.com/dotcloud/docker/runconfig"
"github.com/dotcloud/docker/utils"
"io" "io"
"log"
"os" "os"
"strings" "strings"
) )
@ -28,7 +28,7 @@ func main() {
func cmdDaemon(c *cli.Context) { func cmdDaemon(c *cli.Context) {
app := beam.NewServer() app := beam.NewServer()
app.OnLog(beam.Handler(func(msg *beam.Message) error { app.OnLog(beam.Handler(func(msg *beam.Message) error {
log.Printf("%s\n", strings.Join(msg.Args, " ")) utils.Debugf("%s", strings.Join(msg.Args, " "))
return nil return nil
})) }))
app.OnError(beam.Handler(func(msg *beam.Message) error { app.OnError(beam.Handler(func(msg *beam.Message) error {
@ -43,13 +43,13 @@ func cmdDaemon(c *cli.Context) {
dockerHost = "unix:///var/run/docker.sock" dockerHost = "unix:///var/run/docker.sock"
} }
log.Printf("---> Spawning\n") utils.Debugf("---> Spawning")
instance, err := backend.Spawn(dockerHost) instance, err := backend.Spawn(dockerHost)
if err != nil { if err != nil {
Fatalf("spawn: %v\n", err) Fatalf("spawn: %v\n", err)
} }
log.Printf("---> Attaching\n") utils.Debugf("---> Attaching")
instanceIn, instanceOut, err := instance.Attach("") instanceIn, instanceOut, err := instance.Attach("")
if err != nil { if err != nil {
Fatalf("attach: %v", err) Fatalf("attach: %v", err)
@ -57,7 +57,7 @@ func cmdDaemon(c *cli.Context) {
defer instanceOut.Close() defer instanceOut.Close()
go beam.Copy(app, instanceIn) go beam.Copy(app, instanceIn)
log.Printf("---> Starting\n") utils.Debugf("---> Starting")
if err := instance.Start(); err != nil { if err := instance.Start(); err != nil {
Fatalf("start: %v", err) Fatalf("start: %v", err)
} }
@ -72,7 +72,7 @@ func doCmd(instance *beam.Object, args []string) error {
if len(args) == 0 { if len(args) == 0 {
return fmt.Errorf("no command supplied") return fmt.Errorf("no command supplied")
} }
log.Printf("---> %s\n", args[0]) utils.Debugf("---> %s", args[0])
if args[0] == "ps" { if args[0] == "ps" {
if len(args) != 1 { if len(args) != 1 {
return fmt.Errorf("usage: ps") return fmt.Errorf("usage: ps")