diff options
| author | zeripath <art27@cantab.net> | 2021-09-23 16:45:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-23 23:45:36 +0800 |
| commit | 9302eba971611601c3ebf6024e22a11c63f4e151 (patch) | |
| tree | a3e5583986161ef62e7affc694098279ecf2217d /models/repo_avatar.go | |
| parent | b22be7f594401d7bd81196750456ce52185bd391 (diff) | |
| download | gitea-9302eba971611601c3ebf6024e22a11c63f4e151.tar.gz gitea-9302eba971611601c3ebf6024e22a11c63f4e151.zip | |
DBContext is just a Context (#17100)
* DBContext is just a Context
This PR removes some of the specialness from the DBContext and makes it context
This allows us to simplify the GetEngine code to wrap around any context in future
and means that we can change our loadRepo(e Engine) functions to simply take contexts.
Signed-off-by: Andrew Thornton <art27@cantab.net>
* fix unit tests
Signed-off-by: Andrew Thornton <art27@cantab.net>
* another place that needs to set the initial context
Signed-off-by: Andrew Thornton <art27@cantab.net>
* avoid race
Signed-off-by: Andrew Thornton <art27@cantab.net>
* change attachment error
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'models/repo_avatar.go')
| -rw-r--r-- | models/repo_avatar.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/models/repo_avatar.go b/models/repo_avatar.go index 8133cdc706..bb5f083dd5 100644 --- a/models/repo_avatar.go +++ b/models/repo_avatar.go @@ -57,7 +57,7 @@ func (repo *Repository) generateRandomAvatar(e db.Engine) error { // RemoveRandomAvatars removes the randomly generated avatars that were created for repositories func RemoveRandomAvatars(ctx context.Context) error { - return db.DefaultContext().Engine(). + return db.GetEngine(db.DefaultContext). Where("id > 0").BufferSize(setting.Database.IterateBufferSize). Iterate(new(Repository), func(idx int, bean interface{}) error { @@ -77,7 +77,7 @@ func RemoveRandomAvatars(ctx context.Context) error { // RelAvatarLink returns a relative link to the repository's avatar. func (repo *Repository) RelAvatarLink() string { - return repo.relAvatarLink(db.DefaultContext().Engine()) + return repo.relAvatarLink(db.GetEngine(db.DefaultContext)) } func (repo *Repository) relAvatarLink(e db.Engine) string { @@ -101,7 +101,7 @@ func (repo *Repository) relAvatarLink(e db.Engine) string { // AvatarLink returns a link to the repository's avatar. func (repo *Repository) AvatarLink() string { - return repo.avatarLink(db.DefaultContext().Engine()) + return repo.avatarLink(db.GetEngine(db.DefaultContext)) } // avatarLink returns user avatar absolute link. @@ -129,7 +129,7 @@ func (repo *Repository) UploadAvatar(data []byte) error { return nil } - sess := db.DefaultContext().NewSession() + sess := db.NewSession(db.DefaultContext) defer sess.Close() if err = sess.Begin(); err != nil { return err @@ -172,7 +172,7 @@ func (repo *Repository) DeleteAvatar() error { avatarPath := repo.CustomAvatarRelativePath() log.Trace("DeleteAvatar[%d]: %s", repo.ID, avatarPath) - sess := db.DefaultContext().NewSession() + sess := db.NewSession(db.DefaultContext) defer sess.Close() if err := sess.Begin(); err != nil { return err |