forked from mtusi2026/mtusi2026lab2
feat(httpx): return 503 when a dependency is unavailable
This commit is contained in:
@@ -33,7 +33,7 @@ func (h *AuthHandler) CreateSession(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
if err != nil {
|
||||
httpx.WriteInternalError(w, requestID)
|
||||
httpx.WriteInternalError(w, requestID, err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -65,7 +65,7 @@ func (h *AuthHandler) RevokeSession(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
if err != nil {
|
||||
httpx.WriteInternalError(w, requestID)
|
||||
httpx.WriteInternalError(w, requestID, err)
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ func (h *ChatHandler) Create(w http.ResponseWriter, r *http.Request) {
|
||||
)
|
||||
return
|
||||
case err != nil:
|
||||
httpx.WriteInternalError(w, requestID)
|
||||
httpx.WriteInternalError(w, requestID, err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -106,7 +106,7 @@ func (h *ChatHandler) Get(w http.ResponseWriter, r *http.Request) {
|
||||
)
|
||||
return
|
||||
case err != nil:
|
||||
httpx.WriteInternalError(w, requestID)
|
||||
httpx.WriteInternalError(w, requestID, err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -134,7 +134,7 @@ func (h *ChatHandler) List(w http.ResponseWriter, r *http.Request) {
|
||||
)
|
||||
return
|
||||
case err != nil:
|
||||
httpx.WriteInternalError(w, requestID)
|
||||
httpx.WriteInternalError(w, requestID, err)
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@ func (h *MessageHandler) Create(w http.ResponseWriter, r *http.Request) {
|
||||
)
|
||||
return
|
||||
case err != nil:
|
||||
httpx.WriteInternalError(w, requestID)
|
||||
httpx.WriteInternalError(w, requestID, err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -114,7 +114,7 @@ func (h *MessageHandler) List(w http.ResponseWriter, r *http.Request) {
|
||||
)
|
||||
return
|
||||
case err != nil:
|
||||
httpx.WriteInternalError(w, requestID)
|
||||
httpx.WriteInternalError(w, requestID, err)
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ func (h *UserHandler) Create(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
if err != nil {
|
||||
httpx.WriteInternalError(w, requestID)
|
||||
httpx.WriteInternalError(w, requestID, err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -82,7 +82,7 @@ func (h *UserHandler) Me(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
if err != nil {
|
||||
httpx.WriteInternalError(w, requestID)
|
||||
httpx.WriteInternalError(w, requestID, err)
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,14 @@
|
||||
package httpx
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"net"
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
"github.com/jackc/pgx/v5/pgconn"
|
||||
|
||||
"mtusi2026-messenger/internal/dto"
|
||||
)
|
||||
@@ -23,7 +29,18 @@ func WriteError(w http.ResponseWriter, status int, code dto.ErrorCode, message,
|
||||
})
|
||||
}
|
||||
|
||||
func WriteInternalError(w http.ResponseWriter, requestID string) {
|
||||
func WriteInternalError(w http.ResponseWriter, requestID string, err error) {
|
||||
if isUnavailable(err) {
|
||||
WriteError(
|
||||
w,
|
||||
http.StatusServiceUnavailable,
|
||||
dto.ErrorCodeUnavailable,
|
||||
"dependency unavailable",
|
||||
requestID,
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
WriteError(
|
||||
w,
|
||||
http.StatusInternalServerError,
|
||||
@@ -32,3 +49,19 @@ func WriteInternalError(w http.ResponseWriter, requestID string) {
|
||||
requestID,
|
||||
)
|
||||
}
|
||||
|
||||
func isUnavailable(err error) bool {
|
||||
if errors.Is(err, context.DeadlineExceeded) {
|
||||
return true
|
||||
}
|
||||
|
||||
if _, ok := errors.AsType[net.Error](err); ok {
|
||||
return true
|
||||
}
|
||||
|
||||
if pgErr, ok := errors.AsType[*pgconn.PgError](err); ok {
|
||||
return strings.HasPrefix(pgErr.Code, "08") || pgErr.Code == "57P01"
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ func Auth(auth authenticator) func(http.Handler) http.Handler {
|
||||
return
|
||||
}
|
||||
if err != nil {
|
||||
httpx.WriteInternalError(w, requestID)
|
||||
httpx.WriteInternalError(w, requestID, err)
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user