mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-24 06:06:24 +00:00
Merge pull request 'git-grep: set timeout to 2s by default and allow configuring it' (#4966) from yoctozepto/git-grep-timeout into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4966 Reviewed-by: Otto <otto@codeberg.org>
This commit is contained in:
commit
d26ad8dbe5
|
@ -732,6 +732,7 @@ LEVEL = Info
|
|||
;CLONE = 300
|
||||
;PULL = 300
|
||||
;GC = 60
|
||||
;GREP = 2
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; Git config options
|
||||
|
|
|
@ -15,6 +15,7 @@ import (
|
|||
"os"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
)
|
||||
|
@ -94,6 +95,8 @@ func GrepSearch(ctx context.Context, repo *Repository, search string, opts GrepO
|
|||
opts.MaxResultLimit = cmp.Or(opts.MaxResultLimit, 50)
|
||||
stderr := bytes.Buffer{}
|
||||
err = cmd.Run(&RunOpts{
|
||||
Timeout: time.Duration(setting.Git.Timeout.Grep) * time.Second,
|
||||
|
||||
Dir: repo.Path,
|
||||
Stdout: stdoutWriter,
|
||||
Stderr: &stderr,
|
||||
|
|
|
@ -37,6 +37,7 @@ var Git = struct {
|
|||
Clone int
|
||||
Pull int
|
||||
GC int `ini:"GC"`
|
||||
Grep int
|
||||
} `ini:"git.timeout"`
|
||||
}{
|
||||
DisableDiffHighlight: false,
|
||||
|
@ -59,6 +60,7 @@ var Git = struct {
|
|||
Clone int
|
||||
Pull int
|
||||
GC int `ini:"GC"`
|
||||
Grep int
|
||||
}{
|
||||
Default: 360,
|
||||
Migrate: 600,
|
||||
|
@ -66,6 +68,7 @@ var Git = struct {
|
|||
Clone: 300,
|
||||
Pull: 300,
|
||||
GC: 60,
|
||||
Grep: 2,
|
||||
},
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue