scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 03:27:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

mongodb secret backend: Verify existing Session is still working before reusing it

Browse Source
This commit is contained in:
Matt Hurne
2016-07-07 21:37:44 -04:00
parent 1751d4da68
commit 350ffcf79f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/logical/mongodb/backend.go
View File

@@ -50,12 +50,13 @@ func (b *backend) Session(s logical.Storage) (*mgo.Session, error) {
b.lock.Lock()
defer b.lock.Unlock()
// If we already have a Session, we got it!
if b.session != nil {
return b.session, nil
if err := b.session.Ping(); err == nil {
return b.session, nil
}
b.session.Close()
}
// Otherwise, attempt to make connection
connConfigJSON, err := s.Get("config/connection")
if err != nil {
return nil, err
@@ -84,7 +85,7 @@ func (b *backend) Session(s logical.Storage) (*mgo.Session, error) {
return b.session, nil
}
// ResetSession forces a connection next time Session() is called.
// ResetSession forces creation of a new connection next time Session() is called.
func (b *backend) ResetSession() {
b.lock.Lock()
defer b.lock.Unlock()