davrot/forgejo_backup
1
0
Fork 0
mirror of https://codeberg.org/davrot/forgejo.git synced 2025-05-25 12:00:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

DBContext is just a Context (#17100)

Browse source 
* 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>
This commit is contained in:
zeripath 2021-09-23 16:45:36 +01:00 • committed by GitHub
parent b22be7f594
commit 9302eba971
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
129 changed files with 1112 additions and 1022 deletions
Download patch file Download diff file Expand all files Collapse all files

14
models/session.go
View file

@ -24,7 +24,7 @@ func init() {
// UpdateSession updates the session with provided id
func UpdateSession(key string, data []byte) error {
_, err := db.DefaultContext().Engine().ID(key).Update(&Session{
_, err := db.GetEngine(db.DefaultContext).ID(key).Update(&Session{
Data: data,
Expiry: timeutil.TimeStampNow(),
})
@ -36,7 +36,7 @@ func ReadSession(key string) (*Session, error) {
session := Session{
Key: key,
}
sess := db.DefaultContext().NewSession()
sess := db.NewSession(db.DefaultContext)
defer sess.Close()
if err := sess.Begin(); err != nil {
return nil, err
@ -60,12 +60,12 @@ func ExistSession(key string) (bool, error) {
session := Session{
Key: key,
}
return db.DefaultContext().Engine().Get(&session)
return db.GetEngine(db.DefaultContext).Get(&session)
}
// DestroySession destroys a session
func DestroySession(key string) error {
_, err := db.DefaultContext().Engine().Delete(&Session{
_, err := db.GetEngine(db.DefaultContext).Delete(&Session{
Key: key,
})
return err
@ -73,7 +73,7 @@ func DestroySession(key string) error {
// RegenerateSession regenerates a session from the old id
func RegenerateSession(oldKey, newKey string) (*Session, error) {
sess := db.DefaultContext().NewSession()
sess := db.NewSession(db.DefaultContext)
defer sess.Close()
if err := sess.Begin(); err != nil {
return nil, err
@ -117,11 +117,11 @@ func RegenerateSession(oldKey, newKey string) (*Session, error) {
// CountSessions returns the number of sessions
func CountSessions() (int64, error) {
return db.DefaultContext().Engine().Count(&Session{})
return db.GetEngine(db.DefaultContext).Count(&Session{})
}
// CleanupSessions cleans up expired sessions
func CleanupSessions(maxLifetime int64) error {
_, err := db.DefaultContext().Engine().Where("expiry <= ?", timeutil.TimeStampNow().Add(-maxLifetime)).Delete(&Session{})
_, err := db.GetEngine(db.DefaultContext).Where("expiry <= ?", timeutil.TimeStampNow().Add(-maxLifetime)).Delete(&Session{})
return err
}