LumeWeb
/
tusd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move network timeout handling back in UnroutedHandler

This commit is contained in:
Marius 2017-03-01 19:43:37 +01:00
parent 74fca8c6c3
commit c8b8703bb1
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
metrics.go
View File

@ -2,7 +2,6 @@ package tusd
import (
"errors"
"net"
"sync"
"sync/atomic"
)
@ -88,18 +87,8 @@ type simpleHTTPError struct {
}
func simplifyHTTPError(err HTTPError) simpleHTTPError {
var msg string
// Errors for read timeouts contain too much information which is not
// necessary for us and makes grouping for the metrics harder. The error
// message looks like: read tcp 127.0.0.1:1080->127.0.0.1:53673: i/o timeout
// Therefore, we use a common error message for all of them.
if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
msg = "read tcp: i/o timeout"
} else {
msg = err.Error()
}
return simpleHTTPError{
Message: msg,
Message: err.Error(),
StatusCode: err.StatusCode(),
}
}

9
unrouted_handler.go
View File

@ -5,6 +5,7 @@ import (
"errors"
"io"
"log"
"net"
"net/http"
"os"
"regexp"
@ -611,6 +612,14 @@ func (handler *UnroutedHandler) sendError(w http.ResponseWriter, r *http.Request
err = ErrNotFound
}
// Errors for read timeouts contain too much information which is not
// necessary for us and makes grouping for the metrics harder. The error
// message looks like: read tcp 127.0.0.1:1080->127.0.0.1:53673: i/o timeout
// Therefore, we use a common error message for all of them.
if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
err = errors.New("read tcp: i/o timeout")
}
statusErr, ok := err.(HTTPError)
if !ok {
statusErr = NewHTTPError(err, http.StatusInternalServerError)