| Index: logdog/client/cmd/logdog_butler/main.go
|
| diff --git a/logdog/client/cmd/logdog_butler/main.go b/logdog/client/cmd/logdog_butler/main.go
|
| index e457148c8cc65bad8640b25e06f922dcd828b223..3a53aeb5c3eb9de00e0ffcc0b1918756624c4aff 100644
|
| --- a/logdog/client/cmd/logdog_butler/main.go
|
| +++ b/logdog/client/cmd/logdog_butler/main.go
|
| @@ -5,7 +5,6 @@
|
| package main
|
|
|
| import (
|
| - "bytes"
|
| "flag"
|
| "fmt"
|
| "net/http"
|
| @@ -217,15 +216,8 @@ func logAnnotatedErr(ctx context.Context, err error, f string, args ...interface
|
| return
|
| }
|
|
|
| - var buf bytes.Buffer
|
| - st := errors.RenderStack(err)
|
| - if _, derr := st.DumpTo(&buf); derr != nil {
|
| - // This can't really fail, since we're rendering to a Buffer.
|
| - panic(derr)
|
| - }
|
| -
|
| nargs := make([]interface{}, len(args)+1)
|
| - nargs[copy(nargs, args)] = buf.Bytes()
|
| + nargs[copy(nargs, args)] = strings.Join(errors.RenderStack(err), "\n")
|
|
|
| if f == "" {
|
| f = "Captured error stack:"
|
|
|