Mirrors/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-23 00:56:45 +01:00
Code Issues Projects Releases Packages Wiki Activity

http: Avoid panic if handler errors lack underlying error value

Browse source 
Fixes #2845
This commit is contained in:
Matthew Holt 2019-10-30 21:41:52 -06:00
parent 0dd9243478
commit 8d3c64932e
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/caddyhttp/server.go
View file

@ -368,7 +368,11 @@ type ServerLogConfig struct {
func errLogValues(err error) (status int, msg string, fields []zapcore.Field) { func errLogValues(err error) (status int, msg string, fields []zapcore.Field) {
if handlerErr, ok := err.(HandlerError); ok { if handlerErr, ok := err.(HandlerError); ok {
status = handlerErr.StatusCode status = handlerErr.StatusCode
if handlerErr.Err == nil {
msg = err.Error()
} else {
msg = handlerErr.Err.Error() msg = handlerErr.Err.Error()
}
fields = []zapcore.Field{ fields = []zapcore.Field{
zap.Int("status", handlerErr.StatusCode), zap.Int("status", handlerErr.StatusCode),
zap.String("err_id", handlerErr.ID), zap.String("err_id", handlerErr.ID),