Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00
Code Issues Activity

core: Graceful error handling during heavy load; proper error responses

Browse source
This commit is contained in:
Matthew Holt 2015-04-30 10:14:58 -06:00
parent b51e8bc191
commit b1e1caba29
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
server/fileserver.go
View file

@ -41,10 +41,14 @@ func (f *fileHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, er
func (fh *fileHandler) serveFile(w http.ResponseWriter, r *http.Request, name string) (int, error) { func (fh *fileHandler) serveFile(w http.ResponseWriter, r *http.Request, name string) (int, error) {
f, err := fh.root.Open(name) f, err := fh.root.Open(name)
if err != nil { if err != nil {
if os.IsPermission(err) { if os.IsNotExist(err) {
return http.StatusForbidden, err return http.StatusForbidden, err
} else if os.IsPermission(err) {
return http.StatusNotFound, nil
} }
return http.StatusNotFound, nil // Likely the server is under load and ran out of file descriptors
w.Header().Set("Retry-After", "5") // TODO: 5 seconds enough delay? Or too much?
return http.StatusServiceUnavailable, err
} }
defer f.Close() defer f.Close()
@ -52,8 +56,11 @@ func (fh *fileHandler) serveFile(w http.ResponseWriter, r *http.Request, name st
if err1 != nil { if err1 != nil {
if os.IsPermission(err) { if os.IsPermission(err) {
return http.StatusForbidden, err return http.StatusForbidden, err
} else if os.IsNotExist(err) {
return http.StatusNotFound, nil
} }
return http.StatusNotFound, nil // Return a different status code than above so as to distinguish these cases
return http.StatusInternalServerError, err
} }
// redirect to canonical path // redirect to canonical path