Skip to content

Move all mail related codes from models to services/mailer #7200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Sep 24, 2019
Merged

Move all mail related codes from models to services/mailer #7200

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
9dbf3ca
move all mail related codes from models to modules/mailer
lunny Jun 14, 2019
7931e26
fix lint
lunny Jun 14, 2019
eba99fd
use DBContext instead Engine
lunny Jun 14, 2019
1c2d743
use WithContext not WithEngine
lunny Jun 14, 2019
76dac9f
Use DBContext instead of Engine
lunny Jun 16, 2019
7ddef4c
don't use defer when sess.Close()
lunny Jun 16, 2019
085e6dc
move DBContext to context.go and add some methods
lunny Jun 27, 2019
9042cf6
move mailer from modules/ to services
lunny Jul 1, 2019
5723ac8
fix lint
lunny Jul 9, 2019
6976a7c
fix tests
lunny Aug 15, 2019
875ea99
fix fmt
lunny Aug 15, 2019
0cd0db2
add gitea copyright
lunny Aug 15, 2019
1dcd33c
fix tests
lunny Aug 22, 2019
46e236f
don't expose db functions
lunny Sep 24, 2019
861bfd9
make code clear
lunny Sep 24, 2019
5cfdaf5
add DefaultDBContext
lunny Sep 24, 2019
d602808
fix build
lunny Sep 24, 2019
6f8ae1a
fix bug
lunny Sep 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
don't use defer when sess.Close()
  • Loading branch information
@lunny
lunny committed Sep 24, 2019
commit 7ddef4c26a69dc68a20f843127e7931dd93da595
7 changes: 5 additions & 2 deletions models/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,16 +133,19 @@ func WithContext(f func(ctx DBContext) error) error {
// WithTransaction represents executing database operations on a trasaction
func WithTransaction(f func(ctx DBContext) error) error {
sess := x.NewSession()
defer sess.Close()
if err := sess.Begin(); err != nil {
sess.Close()
return err
}

if err := f(DBContext{sess}); err != nil {
sess.Close()
return err
}

return sess.Commit()
err := sess.Commit()
sess.Close()
return err
}

func getEngine() (*xorm.Engine, error) {
Expand Down