fix: keep context deadline exceeded as last

ipfs · Feb 22, 2023 · 6345364 · 6345364
1 parent 36097b2
commit 6345364
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/gateway/handler.go b/gateway/handler.go
@@ -572,12 +572,12 @@ func webError(w http.ResponseWriter, message string, err error, defaultCode int)
 		webErrorWithCode(w, message, err, http.StatusNotFound)
 	} else if ipld.IsNotFound(err) {
 		webErrorWithCode(w, message, err, http.StatusNotFound)
-	} else if errors.Is(err, context.DeadlineExceeded) || err == context.DeadlineExceeded {
-		webErrorWithCode(w, message, err, http.StatusRequestTimeout)
 	} else if errors.Is(err, ErrGatewayTimeout) {
 		webErrorWithCode(w, message, err, http.StatusGatewayTimeout)
 	} else if errors.Is(err, ErrBadGateway) {
 		webErrorWithCode(w, message, err, http.StatusBadGateway)
+	} else if errors.Is(err, context.DeadlineExceeded) || err == context.DeadlineExceeded {
+		webErrorWithCode(w, message, err, http.StatusRequestTimeout)
 	} else {
 		webErrorWithCode(w, message, err, defaultCode)
 	}