Response for context on retry database connection (#9444)

diff --git a/routers/init.go b/routers/init.go
index 01df15d6c5934bf64949d1f1860e81c01521d230..ee74ef79704bc47c35500bb2c6518bdbd969bf74 100644 (file)
--- a/routers/init.go
+++ b/routers/init.go
@@ -6,6 +6,7 @@ package routers
 
 import (
        "context"
+       "fmt"
        "strings"
        "time"
 
@@ -57,6 +58,11 @@ func NewServices() {
 func initDBEngine(ctx context.Context) (err error) {
        log.Info("Beginning ORM engine initialization.")
        for i := 0; i < setting.Database.DBConnectRetries; i++ {
+               select {
+               case <-ctx.Done():
+                       return fmt.Errorf("Aborted due to shutdown:\nin retry ORM engine initialization")
+               default:
+               }
                log.Info("ORM engine initialization attempt #%d/%d...", i+1, setting.Database.DBConnectRetries)
                if err = models.NewEngine(ctx, migrations.Migrate); err == nil {
                        break