sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-02 11:39:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate duplicate timeout cases in classifyProxyError

Browse Source
This commit is contained in:
Viktor Liu
2026-02-13 13:02:40 +01:00
parent a718d6ede2
commit 3971d2f4fd
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proxy/internal/proxy/reverseproxy.go
+2 -7
View File
@@ -320,7 +320,8 @@ func getRequestID(r *http.Request) string {
// status code, and component status based on the error type. // status code, and component status based on the error type.
func classifyProxyError(err error) (title, message string, code int, status web.ErrorStatus) { func classifyProxyError(err error) (title, message string, code int, status web.ErrorStatus) {
switch { switch {
case errors.Is(err, context.DeadlineExceeded): case errors.Is(err, context.DeadlineExceeded),
isNetTimeout(err):
return "Request Timeout", return "Request Timeout",
"The request timed out while trying to reach the service. Please refresh the page and try again.", "The request timed out while trying to reach the service. Please refresh the page and try again.",
http.StatusGatewayTimeout, http.StatusGatewayTimeout,
@@ -356,12 +357,6 @@ func classifyProxyError(err error) (title, message string, code int, status web.
"The connection to the peer could not be established. Please ensure the peer is running and connected to the NetBird network.", "The connection to the peer could not be established. Please ensure the peer is running and connected to the NetBird network.",
http.StatusBadGateway, http.StatusBadGateway,
web.ErrorStatus{Proxy: true, Destination: false} web.ErrorStatus{Proxy: true, Destination: false}
case isNetTimeout(err):
return "Request Timeout",
"The request timed out while trying to reach the service. Please refresh the page and try again.",
http.StatusGatewayTimeout,
web.ErrorStatus{Proxy: true, Destination: false}
} }
return "Connection Error", return "Connection Error",