|
|
|
@ -14,12 +14,14 @@ import (
|
|
|
|
|
|
|
|
|
|
// WriteError writes to w a JSON representation of the given error.
|
|
|
|
|
func WriteError(w http.ResponseWriter, err error) {
|
|
|
|
|
switch err.(type) {
|
|
|
|
|
switch k := err.(type) {
|
|
|
|
|
case *acme.Error:
|
|
|
|
|
w.Header().Set("Content-Type", "application/problem+json")
|
|
|
|
|
acme.WriteError(w, k)
|
|
|
|
|
return
|
|
|
|
|
default:
|
|
|
|
|
w.Header().Set("Content-Type", "application/json")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
cause := errors.Cause(err)
|
|
|
|
|
if sc, ok := err.(errs.StatusCoder); ok {
|
|
|
|
|
w.WriteHeader(sc.StatusCode())
|
|
|
|
@ -33,15 +35,11 @@ func WriteError(w http.ResponseWriter, err error) {
|
|
|
|
|
|
|
|
|
|
// Write errors in the response writer
|
|
|
|
|
if rl, ok := w.(logging.ResponseLogger); ok {
|
|
|
|
|
logErr := err
|
|
|
|
|
if u, ok := err.(*acme.Error); ok {
|
|
|
|
|
logErr = u.Err
|
|
|
|
|
}
|
|
|
|
|
rl.WithFields(map[string]interface{}{
|
|
|
|
|
"error": logErr,
|
|
|
|
|
"error": err,
|
|
|
|
|
})
|
|
|
|
|
if os.Getenv("STEPDEBUG") == "1" {
|
|
|
|
|
if e, ok := logErr.(errs.StackTracer); ok {
|
|
|
|
|
if e, ok := err.(errs.StackTracer); ok {
|
|
|
|
|
rl.WithFields(map[string]interface{}{
|
|
|
|
|
"stack-trace": fmt.Sprintf("%+v", e),
|
|
|
|
|
})
|
|
|
|
|