aboutsummaryrefslogtreecommitdiffstats
path: root/routers/web
diff options
context:
space:
mode:
authordelvh <dev.lh@web.de>2023-07-24 05:47:27 +0200
committerGitHub <noreply@github.com>2023-07-23 23:47:27 -0400
commitf3d41c61eb0e66aacc269508d27716425673509b (patch)
tree37990d8fbe3c7e8bac6208cde513e5bed5126232 /routers/web
parent24c3bb95acfd906dc752f867615dafd170176502 (diff)
downloadgitea-f3d41c61eb0e66aacc269508d27716425673509b.tar.gz
gitea-f3d41c61eb0e66aacc269508d27716425673509b.zip
Remove `db.DefaultContext` in `routers/` and `cmd/` (#26076)
Now, the only remaining usages of `models.db.DefaultContext` are in - `modules` - `models` - `services`
Diffstat (limited to 'routers/web')
-rw-r--r--routers/web/admin/packages.go2
-rw-r--r--routers/web/healthcheck/check.go7
-rw-r--r--routers/web/repo/view.go8
3 files changed, 9 insertions, 8 deletions
diff --git a/routers/web/admin/packages.go b/routers/web/admin/packages.go
index ace54fc0d8..731a1d6ac2 100644
--- a/routers/web/admin/packages.go
+++ b/routers/web/admin/packages.go
@@ -85,7 +85,7 @@ func Packages(ctx *context.Context) {
// DeletePackageVersion deletes a package version
func DeletePackageVersion(ctx *context.Context) {
- pv, err := packages_model.GetVersionByID(db.DefaultContext, ctx.FormInt64("id"))
+ pv, err := packages_model.GetVersionByID(ctx, ctx.FormInt64("id"))
if err != nil {
ctx.ServerError("GetRepositoryByID", err)
return
diff --git a/routers/web/healthcheck/check.go b/routers/web/healthcheck/check.go
index e11dd2aca2..ecb73a928f 100644
--- a/routers/web/healthcheck/check.go
+++ b/routers/web/healthcheck/check.go
@@ -4,6 +4,7 @@
package healthcheck
import (
+ "context"
"net/http"
"os"
"time"
@@ -72,7 +73,7 @@ func Check(w http.ResponseWriter, r *http.Request) {
statuses := make([]status, 0)
if setting.InstallLock {
- statuses = append(statuses, checkDatabase(rsp.Checks))
+ statuses = append(statuses, checkDatabase(r.Context(), rsp.Checks))
statuses = append(statuses, checkCache(rsp.Checks))
}
for _, s := range statuses {
@@ -89,9 +90,9 @@ func Check(w http.ResponseWriter, r *http.Request) {
}
// database checks gitea database status
-func checkDatabase(checks checks) status {
+func checkDatabase(ctx context.Context, checks checks) status {
st := componentStatus{}
- if err := db.GetEngine(db.DefaultContext).Ping(); err != nil {
+ if err := db.GetEngine(ctx).Ping(); err != nil {
st.Status = fail
st.Time = getCheckTime()
log.Error("database ping failed with error: %v", err)
diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
index a1c82f5395..221c1f4c4f 100644
--- a/routers/web/repo/view.go
+++ b/routers/web/repo/view.go
@@ -198,7 +198,7 @@ type fileInfo struct {
st typesniffer.SniffedType
}
-func getFileReader(repoID int64, blob *git.Blob) ([]byte, io.ReadCloser, *fileInfo, error) {
+func getFileReader(ctx gocontext.Context, repoID int64, blob *git.Blob) ([]byte, io.ReadCloser, *fileInfo, error) {
dataRc, err := blob.DataAsync()
if err != nil {
return nil, nil, nil, err
@@ -221,7 +221,7 @@ func getFileReader(repoID int64, blob *git.Blob) ([]byte, io.ReadCloser, *fileIn
return buf, dataRc, &fileInfo{isTextFile, false, blob.Size(), nil, st}, nil
}
- meta, err := git_model.GetLFSMetaObjectByOid(db.DefaultContext, repoID, pointer.Oid)
+ meta, err := git_model.GetLFSMetaObjectByOid(ctx, repoID, pointer.Oid)
if err != nil && err != git_model.ErrLFSObjectNotExist { // fallback to plain file
return buf, dataRc, &fileInfo{isTextFile, false, blob.Size(), nil, st}, nil
}
@@ -265,7 +265,7 @@ func renderReadmeFile(ctx *context.Context, subfolder string, readmeFile *git.Tr
ctx.Data["ReadmeExist"] = true
ctx.Data["FileIsSymlink"] = readmeFile.IsLink()
- buf, dataRc, fInfo, err := getFileReader(ctx.Repo.Repository.ID, target.Blob())
+ buf, dataRc, fInfo, err := getFileReader(ctx, ctx.Repo.Repository.ID, target.Blob())
if err != nil {
ctx.ServerError("getFileReader", err)
return
@@ -328,7 +328,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
ctx.Data["IsViewFile"] = true
ctx.Data["HideRepoInfo"] = true
blob := entry.Blob()
- buf, dataRc, fInfo, err := getFileReader(ctx.Repo.Repository.ID, blob)
+ buf, dataRc, fInfo, err := getFileReader(ctx, ctx.Repo.Repository.ID, blob)
if err != nil {
ctx.ServerError("getFileReader", err)
return