lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure error is logged on db reconnection attempts (#5780) 

Unfortunately a scoping problem was missed on the previous PR which meant that the only nil error was logged on failure to connect to the db. This pr fixes this.
release/v1.15
Paul Brackin 2019-01-20 01:30:37 -08:00 committed by zeripath
parent dbb4aeead9
commit f631702299
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
routers/init.go
View File

@ -48,7 +48,7 @@ func initDBEngine() (err error) {
log.Info("Beginning ORM engine initialization.") log.Info("Beginning ORM engine initialization.")
for i := 0; i < setting.DBConnectRetries; i++ { for i := 0; i < setting.DBConnectRetries; i++ {
log.Info("ORM engine initialization attempt #%d/%d...", i+1, setting.DBConnectRetries) log.Info("ORM engine initialization attempt #%d/%d...", i+1, setting.DBConnectRetries)
if err := models.NewEngine(migrations.Migrate); err == nil { if err = models.NewEngine(migrations.Migrate); err == nil {
break break
} else if i == setting.DBConnectRetries-1 { } else if i == setting.DBConnectRetries-1 {
return err return err