Merge pull request #164 from stz184/implement-db-connection-retry
Added db connection retry logic
This commit is contained in:
commit
a10f8ad1ef
|
@ -1,9 +1,11 @@
|
||||||
package database
|
package database
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"log"
|
"log"
|
||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/photoview/photoview/api/graphql/models"
|
"github.com/photoview/photoview/api/graphql/models"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
|
@ -39,11 +41,31 @@ func SetupDatabase() (*gorm.DB, error) {
|
||||||
config.Logger = logger.Default.LogMode(logger.Info)
|
config.Logger = logger.Default.LogMode(logger.Info)
|
||||||
|
|
||||||
db, err := gorm.Open(mysql.Open(address.String()), &config)
|
db, err := gorm.Open(mysql.Open(address.String()), &config)
|
||||||
if err != nil {
|
sqlDB, dbErr := db.DB()
|
||||||
return nil, errors.Wrap(err, "could not connect to database")
|
if dbErr != nil {
|
||||||
|
log.Println(dbErr)
|
||||||
|
return nil, dbErr
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Add connection retries
|
sqlDB.SetMaxOpenConns(80)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
for retryCount := 1; retryCount <= 5; retryCount++ {
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||||
|
|
||||||
|
if err := sqlDB.PingContext(ctx); err == nil {
|
||||||
|
cancel()
|
||||||
|
return db, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
cancel()
|
||||||
|
|
||||||
|
log.Printf("WARN: Could not ping database: %s. Will retry after 5 seconds\n", err)
|
||||||
|
time.Sleep(time.Duration(5) * time.Second)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
return db, nil
|
return db, nil
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue