Skip to content
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

Jump to bottom

Open transaction when adding Avatar email-hash pairs to the DB #12577

Merged
merged 4 commits into from
Aug 24, 2020
Merged

Open transaction when adding Avatar email-hash pairs to the DB #12577

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e750b78
Open transaction when adding Avatar email-hash pairs to the DB
zeripath Aug 23, 2020
6d2118b
Merge branch 'master' into fix-12287-insert-into-avatar-email-list-if…
zeripath Aug 23, 2020
43906a3
Merge branch 'master' into fix-12287-insert-into-avatar-email-list-if…
techknowlogick Aug 24, 2020
0502ed5
Merge branch 'master' into fix-12287-insert-into-avatar-email-list-if…
techknowlogick Aug 24, 2020
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
13 changes: 12 additions & 1 deletion models/avatar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,18 @@ func AvatarLink(email string) string {
Email: lowerEmail,
Hash: sum,
}
_, _ = x.Insert(emailHash)
// OK we're going to open a session just because I think that that might hide away any problems with postgres reporting errors
sess := x.NewSession()
defer sess.Close()
if err := sess.Begin(); err != nil {
// we don't care about any DB problem just return the lowerEmail
return lowerEmail, nil
}
_, _ = sess.Insert(emailHash)
if err := sess.Commit(); err != nil {
// Seriously we don't care about any DB problems just return the lowerEmail - we expect the transaction to fail most of the time
return lowerEmail, nil
}
return lowerEmail, nil
})
return setting.AppSubURL + "/avatar/" + url.PathEscape(sum)
Expand Down