github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-27 20:48:11 +00:00
Code Issues Projects Releases Wiki Activity

diagnostics: Correct error formatting

Browse Source 
They should be formatted as %s not %#v (which prints all sorts of opaque
pointers).

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
This commit is contained in:
Ian Campbell 2016-07-01 15:14:12 +01:00
parent c9c9994d89
commit 421dee55d0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
alpine/packages/diagnostics/main.go
View File

@ -22,11 +22,11 @@ func run(timeout time.Duration, w *tar.Writer, command string, args ...string) {
c := exec.Command(command, args...) c := exec.Command(command, args...)
stdoutPipe, err := c.StdoutPipe() stdoutPipe, err := c.StdoutPipe()
if err != nil { if err != nil {
log.Fatalf("Failed to create stdout pipe: %#v", err) log.Fatalf("Failed to create stdout pipe: %s", err)
} }
stderrPipe, err := c.StderrPipe() stderrPipe, err := c.StderrPipe()
if err != nil { if err != nil {
log.Fatalf("Failed to create stderr pipe: %#v", err) log.Fatalf("Failed to create stderr pipe: %s", err)
} }
var stdoutBuffer bytes.Buffer var stdoutBuffer bytes.Buffer
var stderrBuffer bytes.Buffer var stderrBuffer bytes.Buffer
@ -129,20 +129,20 @@ func main() {
ip, err := net.Listen("tcp", ":62374") ip, err := net.Listen("tcp", ":62374")
if err != nil { if err != nil {
log.Printf("Failed to bind to TCP port 62374: %#v", err) log.Printf("Failed to bind to TCP port 62374: %s", err)
} else { } else {
listeners = append(listeners, ip) listeners = append(listeners, ip)
} }
vsock, err := vsock.Listen(uint(62374)) vsock, err := vsock.Listen(uint(62374))
if err != nil { if err != nil {
log.Printf("Failed to bind to vsock port 62374: %#v", err) log.Printf("Failed to bind to vsock port 62374: %s", err)
} else { } else {
listeners = append(listeners, vsock) listeners = append(listeners, vsock)
} }
svcid, _ := hvsock.GuidFromString("445BA2CB-E69B-4912-8B42-D7F494D007EA") svcid, _ := hvsock.GuidFromString("445BA2CB-E69B-4912-8B42-D7F494D007EA")
hvsock, err := hvsock.Listen(hvsock.HypervAddr{VmId: hvsock.GUID_WILDCARD, ServiceId: svcid}) hvsock, err := hvsock.Listen(hvsock.HypervAddr{VmId: hvsock.GUID_WILDCARD, ServiceId: svcid})
if err != nil { if err != nil {
log.Printf("Failed to bind to hvsock port: %#v", err) log.Printf("Failed to bind to hvsock port: %s", err)
} else { } else {
listeners = append(listeners, hvsock) listeners = append(listeners, hvsock)
} }
@ -152,7 +152,7 @@ func main() {
for { for {
conn, err := l.Accept() conn, err := l.Accept()
if err != nil { if err != nil {
log.Printf("Error accepting connection: %#v", err) log.Printf("Error accepting connection: %s", err)
return // no more listening return // no more listening
} }
go func(conn net.Conn) { go func(conn net.Conn) {