diff options
Diffstat (limited to 'tsweb/tsweb.go')
| -rw-r--r-- | tsweb/tsweb.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tsweb/tsweb.go b/tsweb/tsweb.go index 1c8ff01bc..649abdfa0 100644 --- a/tsweb/tsweb.go +++ b/tsweb/tsweb.go @@ -236,8 +236,13 @@ func (h retHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { case hErrOK: // Handler asked us to send an error. Do so, if we haven't // already sent a response. + msg.Err = hErr.Msg if hErr.Err != nil { - msg.Err = hErr.Err.Error() + if msg.Err == "" { + msg.Err = hErr.Err.Error() + } else { + msg.Err = msg.Err + ": " + hErr.Err.Error() + } } if lw.code != 0 { h.logf("[unexpected] handler returned HTTPError %v, but already sent a response with code %d", hErr, lw.code) |