give the more suitable name for retry configuraion items

Author: lunny

custom/conf/app.ini.sample

@@ -894,7 +894,7 @@ QUEUE_LENGTH = 1000
 QUEUE_CONN_STR = "addrs=127.0.0.1:6379 db=0"
 
 [migrations]
-; Retry times on migrations for every http/https request.
-RETRY_MAX_TIMES = 3
-; Time as seconds to delay before next retry.
-RETRY_DELAY = 3
+; Max attempts per http/https request on migrations.
+MAX_ATTEMPTS = 3
+; Backoff time per http/https request retry (seconds)
+RETRY_BACKOFF = 3

modules/migrations/migrate.go

@@ -65,8 +65,8 @@ func MigrateRepository(doer *models.User, ownerName string, opts base.MigrateOpt
 
 	uploader.gitServiceType = opts.GitServiceType
 
-	if setting.Migrations.RetryMaxTimes > 0 {
-		downloader = base.NewRetryDownloader(downloader, setting.Migrations.RetryMaxTimes+1, setting.Migrations.RetryDelay)
+	if setting.Migrations.MaxAttempts > 0 {
+		downloader = base.NewRetryDownloader(downloader, setting.Migrations.MaxAttempts, setting.Migrations.RetryBackoff)
 	}
 
 	if err := migrateRepository(downloader, uploader, opts); err != nil {

modules/setting/migrations.go

@@ -7,16 +7,16 @@ package setting
 var (
 	// Migrations settings
 	Migrations = struct {
-		RetryMaxTimes int
-		RetryDelay    int
+		MaxAttempts  int
+		RetryBackoff int
 	}{
-		RetryMaxTimes: 2, // after failure, it will try again x times.
-		RetryDelay:    3, // delay seconds before next retry
+		MaxAttempts:  3,
+		RetryBackoff: 3,
 	}
 )
 
 func newMigrationsService() {
 	sec := Cfg.Section("migrations")
-	Migrations.RetryMaxTimes = sec.Key("RETRY_MAX_TIMES").MustInt(Migrations.RetryMaxTimes)
-	Migrations.RetryDelay = sec.Key("RETRY_DELAY").MustInt(Migrations.RetryDelay)
+	Migrations.MaxAttempts = sec.Key("MAX_ATTEMPTS").MustInt(Migrations.MaxAttempts)
+	Migrations.RetryBackoff = sec.Key("RETRY_BACKOFF").MustInt(Migrations.RetryBackoff)
 }