From 1f185f329bb82c87b250fb2312ae873d69a20d38 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Sat, 22 Mar 2025 13:59:00 +0800 Subject: Use a custom errPage500 --- http_server.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'http_server.go') diff --git a/http_server.go b/http_server.go index 10b7d03..c86dae6 100644 --- a/http_server.go +++ b/http_server.go @@ -37,7 +37,7 @@ func (router *forgeHTTPRouter) ServeHTTP(writer http.ResponseWriter, request *ht userID, params["username"], err = getUserFromRequest(request) params["user_id"] = userID if err != nil && !errors.Is(err, http.ErrNoCookie) && !errors.Is(err, pgx.ErrNoRows) { - http.Error(writer, "Error getting user info from request: "+err.Error(), http.StatusInternalServerError) + errorPage500(writer, params, "Error getting user info from request: "+err.Error()) return } @@ -131,12 +131,12 @@ func (router *forgeHTTPRouter) ServeHTTP(writer http.ResponseWriter, request *ht switch segments[sepIndex+3] { case "info": if err = httpHandleRepoInfo(writer, request, params); err != nil { - http.Error(writer, err.Error(), http.StatusInternalServerError) + errorPage500(writer, params, err.Error()) } return case "git-upload-pack": if err = httpHandleUploadPack(writer, request, params); err != nil { - http.Error(writer, err.Error(), http.StatusInternalServerError) + errorPage500(writer, params, err.Error()) } return } @@ -146,7 +146,7 @@ func (router *forgeHTTPRouter) ServeHTTP(writer http.ResponseWriter, request *ht if errors.Is(err, errNoRefSpec) { params["ref_type"] = "" } else { - http.Error(writer, "Error querying ref type: "+err.Error(), http.StatusInternalServerError) + errorPage500(writer, params, "Error querying ref type: "+err.Error()) return } } @@ -154,7 +154,7 @@ func (router *forgeHTTPRouter) ServeHTTP(writer http.ResponseWriter, request *ht // TODO: subgroups if params["repo"], params["repo_description"], params["repo_id"], err = openRepo(request.Context(), groupPath, moduleName); err != nil { - http.Error(writer, "Error opening repo: "+err.Error(), http.StatusInternalServerError) + errorPage500(writer, params, "Error opening repo: "+err.Error()) return } -- cgit v1.2.3