luxolus/open-vault
2
0
Fork 0
Code Issues 1 Pull requests Releases Activity

Have SQL backends Ping() before access.

Browse source 
If unsuccessful, reestablish connections as needed.
This commit is contained in:
Jeff Mitchell 2016-07-01 12:00:21 -04:00
parent 90c2f5bb55
commit a2e95614d6
4 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
builtin/logical/mssql/backend.go
View file

@ -51,7 +51,12 @@ func (b *backend) DB(s logical.Storage) (*sql.DB, error) {
// If we already have a DB, we got it!
if b.db != nil {
return b.db, nil
if err := b.db.Ping(); err == nil {
return b.db, nil
}
// If the ping was unsuccessful, close it and ignore errors as we'll be
// reestablishing anyways
b.db.Close()
}
// Otherwise, attempt to make connection

7
builtin/logical/mysql/backend.go
View file

@ -50,7 +50,12 @@ func (b *backend) DB(s logical.Storage) (*sql.DB, error) {
// If we already have a DB, we got it!
if b.db != nil {
return b.db, nil
if err := b.db.Ping(); err == nil {
return b.db, nil
}
// If the ping was unsuccessful, close it and ignore errors as we'll be
// reestablishing anyways
b.db.Close()
}
// Otherwise, attempt to make connection

7
builtin/logical/postgresql/backend.go
View file

@ -57,7 +57,12 @@ func (b *backend) DB(s logical.Storage) (*sql.DB, error) {
// If we already have a DB, we got it!
if b.db != nil {
return b.db, nil
if err := b.db.Ping(); err == nil {
return b.db, nil
}
// If the ping was unsuccessful, close it and ignore errors as we'll be
// reestablishing anyways
b.db.Close()
}
// Otherwise, attempt to make connection

5
builtin/logical/postgresql/backend_test.go
View file

@ -132,7 +132,7 @@ func TestBackend_basic(t *testing.T) {
Steps: []logicaltest.TestStep{
testAccStepConfig(t, connData, false),
testAccStepRole(t),
testAccStepReadCreds(t, b, "web", connURL),
testAccStepReadCreds(t, b, config.StorageView, "web", connURL),
},
})
}
@ -211,7 +211,7 @@ func testAccStepDeleteRole(t *testing.T, n string) logicaltest.TestStep {
}
}
func testAccStepReadCreds(t *testing.T, b logical.Backend, name string, connURL string) logicaltest.TestStep {
func testAccStepReadCreds(t *testing.T, b logical.Backend, s logical.Storage, name string, connURL string) logicaltest.TestStep {
return logicaltest.TestStep{
Operation: logical.ReadOperation,
Path: "creds/" + name,
@ -266,6 +266,7 @@ func testAccStepReadCreds(t *testing.T, b logical.Backend, name string, connURL
resp, err = b.HandleRequest(&logical.Request{
Operation: logical.RevokeOperation,
Storage: s,
Secret: &logical.Secret{
InternalData: map[string]interface{}{
"secret_type": "creds",