Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-07 06:40:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

improve SQL provider availability check adding a timeout

Browse Source
This commit is contained in:
Nicola Murino
2019-09-14 16:18:31 +02:00
parent 29aadbf3e3
commit 018b10808d
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dataprovider/sqlcommon.go
View File

@@ -1,6 +1,7 @@
package dataprovider
import (
"context"
"database/sql"
"encoding/json"
"errors"
@@ -51,7 +52,9 @@ func sqlCommonValidateUserAndPubKey(username string, pubKey string, dbHandle *sq
}
func sqlCommonCheckAvailability(dbHandle *sql.DB) error {
return dbHandle.Ping()
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
return dbHandle.PingContext(ctx)
}
func sqlCommonGetUserByID(ID int64, dbHandle *sql.DB) (User, error) {