IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11238 from grafana/11155-mysql-issue

Browse Source 
middleware: recover and retry on session start
This commit is contained in:
Carl Bergquist 2018-03-14 14:29:47 +01:00 committed by GitHub
commit a8918047a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/services/session/session.go
View File

@ -105,6 +105,18 @@ type SessionWrapper struct {
} }
func (s *SessionWrapper) Start(c *macaron.Context) error { func (s *SessionWrapper) Start(c *macaron.Context) error {
// See https://github.com/grafana/grafana/issues/11155 for details on why
// a recover and retry is needed
defer func() error {
if err := recover(); err != nil {
var retryErr error
s.session, retryErr = s.manager.Start(c)
return retryErr
}
return nil
}()
var err error var err error
s.session, err = s.manager.Start(c) s.session, err = s.manager.Start(c)
return err return err