fine tune

Author: wxiaoguang

routers/install/routes.go

@@ -107,7 +107,7 @@ func Routes() *web.Route {
 	r.Use(Init)
 	r.Get("/", Install)
 	r.Post("/", web.Bind(forms.InstallForm{}), SubmitInstall)
-	r.Get("/api/healthz", healthcheck.CheckInstall)
+	r.Get("/api/healthz", healthcheck.Check)
 
 	r.NotFound(web.Wrap(installNotFound))
 	return r

routers/web/healthcheck/check.go

@@ -67,14 +67,15 @@ type componentStatus struct {
 func Check(w http.ResponseWriter, r *http.Request) {
 	rsp := response{
 		Status:      pass,
-		Description: "Gitea: Git with a cup of tea",
+		Description: setting.AppName,
 		Checks:      make(checks),
 	}
 
 	statuses := make([]status, 0)
-	statuses = append(statuses, checkDatabase(rsp.Checks))
-	statuses = append(statuses, checkCache(rsp.Checks))
-
+	if setting.InstallLock {
+		statuses = append(statuses, checkDatabase(rsp.Checks))
+		statuses = append(statuses, checkCache(rsp.Checks))
+	}
 	for _, s := range statuses {
 		if s != pass {
 			rsp.Status = fail
@@ -88,19 +89,6 @@ func Check(w http.ResponseWriter, r *http.Request) {
 	_, _ = w.Write(data)
 }
 
-// CheckInstall always return pass. Should only be used in Install routes
-func CheckInstall(w http.ResponseWriter, r *http.Request) {
-	rsp := response{
-		Status:      pass,
-		Description: "Gitea: Installation stage",
-	}
-
-	data, _ := json.MarshalIndent(rsp, "", "  ")
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(rsp.Status.ToHTTPStatus())
-	_, _ = w.Write(data)
-}
-
 // database checks gitea database status
 func checkDatabase(checks checks) status {
 	st := componentStatus{}

routers/web/web.go

@@ -31,8 +31,8 @@ import (
 	"code.gitea.io/gitea/routers/web/events"
 	"code.gitea.io/gitea/routers/web/explore"
 	"code.gitea.io/gitea/routers/web/feed"
-	"code.gitea.io/gitea/routers/web/misc"
 	"code.gitea.io/gitea/routers/web/healthcheck"
+	"code.gitea.io/gitea/routers/web/misc"
 	"code.gitea.io/gitea/routers/web/org"
 	"code.gitea.io/gitea/routers/web/repo"
 	"code.gitea.io/gitea/routers/web/user"