Skip to content

Commit 9e8cc3b

Browse files
lunnyzeripath
authored andcommitted
add default time out for git operations (#6015)
1 parent 681345d commit 9e8cc3b

File tree

4 files changed

+9
-0
lines changed

4 files changed

+9
-0
lines changed

custom/conf/app.ini.sample

+1
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,7 @@ GC_ARGS =
610610

611611
; Operation timeout in seconds
612612
[git.timeout]
613+
DEFAULT = 360
613614
MIGRATE = 600
614615
MIRROR = 300
615616
CLONE = 300

docs/content/doc/advanced/config-cheat-sheet.en-us.md

+1
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
316316
- `GC_ARGS`: **\<empty\>**: Arguments for command `git gc`, e.g. `--aggressive --auto`. See more on http://git-scm.com/docs/git-gc/
317317

318318
## Git - Timeout settings (`git.timeout`)
319+
- `DEFAUlT`: **360**: Git operations default timeout seconds.
319320
- `MIGRATE`: **600**: Migrate external repositories timeout seconds.
320321
- `MIRROR`: **300**: Mirror external repositories timeout seconds.
321322
- `CLONE`: **300**: Git clone from internal repositories timeout seconds.

docs/content/doc/advanced/config-cheat-sheet.zh-cn.md

+2
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,8 @@ menu:
188188
- `GC_ARGS`: 执行 `git gc` 命令的参数, 比如: `--aggressive --auto`
189189

190190
## Git - 超时设置 (`git.timeout`)
191+
192+
- `DEFAUlT`: **360**: Git操作默认超时时间,单位秒
191193
- `MIGRATE`: **600**: 迁移外部仓库时的超时时间,单位秒
192194
- `MIRROR`: **300**: 镜像外部仓库的超时时间,单位秒
193195
- `CLONE`: **300**: 内部仓库间克隆的超时时间,单位秒

modules/setting/setting.go

+5
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,7 @@ var (
526526
MaxGitDiffFiles int
527527
GCArgs []string `delim:" "`
528528
Timeout struct {
529+
Default int
529530
Migrate int
530531
Mirror int
531532
Clone int
@@ -539,12 +540,14 @@ var (
539540
MaxGitDiffFiles: 100,
540541
GCArgs: []string{},
541542
Timeout: struct {
543+
Default int
542544
Migrate int
543545
Mirror int
544546
Clone int
545547
Pull int
546548
GC int `ini:"GC"`
547549
}{
550+
Default: int(git.DefaultCommandExecutionTimeout / time.Second),
548551
Migrate: 600,
549552
Mirror: 300,
550553
Clone: 300,
@@ -1142,6 +1145,8 @@ func NewContext() {
11421145
log.Fatal(4, "Failed to map Metrics settings: %v", err)
11431146
}
11441147

1148+
git.DefaultCommandExecutionTimeout = time.Duration(Git.Timeout.Default) * time.Second
1149+
11451150
sec = Cfg.Section("mirror")
11461151
Mirror.MinInterval = sec.Key("MIN_INTERVAL").MustDuration(10 * time.Minute)
11471152
Mirror.DefaultInterval = sec.Key("DEFAULT_INTERVAL").MustDuration(8 * time.Hour)

0 commit comments

Comments
 (0)