Use git.timeout/DEFAULT for requests made to the internal hook api

Author: Mik4sa

modules/private/hook.go

@@ -86,7 +86,10 @@ type HookProcReceiveRefResult struct {
 func HookPreReceive(ctx context.Context, ownerName, repoName string, opts HookOptions) ResponseExtra {
 	reqURL := setting.LocalURL + fmt.Sprintf("api/internal/hook/pre-receive/%s/%s", url.PathEscape(ownerName), url.PathEscape(repoName))
 	req := newInternalRequestAPI(ctx, reqURL, "POST", opts)
-	req.SetReadWriteTimeout(time.Duration(60+len(opts.OldCommitIDs)) * time.Second)
+
+	timeout := getHookRequestTimeout(opts)
+	req.SetReadWriteTimeout(timeout)
+
 	_, extra := requestJSONResp(req, &ResponseText{})
 	return extra
 }
@@ -95,16 +98,21 @@ func HookPreReceive(ctx context.Context, ownerName, repoName string, opts HookOp
 func HookPostReceive(ctx context.Context, ownerName, repoName string, opts HookOptions) (*HookPostReceiveResult, ResponseExtra) {
 	reqURL := setting.LocalURL + fmt.Sprintf("api/internal/hook/post-receive/%s/%s", url.PathEscape(ownerName), url.PathEscape(repoName))
 	req := newInternalRequestAPI(ctx, reqURL, "POST", opts)
-	req.SetReadWriteTimeout(time.Duration(60+len(opts.OldCommitIDs)) * time.Second)
+
+	timeout := getHookRequestTimeout(opts)
+	req.SetReadWriteTimeout(timeout)
+
 	return requestJSONResp(req, &HookPostReceiveResult{})
 }
 
 // HookProcReceive proc-receive hook
 func HookProcReceive(ctx context.Context, ownerName, repoName string, opts HookOptions) (*HookProcReceiveResult, ResponseExtra) {
 	reqURL := setting.LocalURL + fmt.Sprintf("api/internal/hook/proc-receive/%s/%s", url.PathEscape(ownerName), url.PathEscape(repoName))
-
 	req := newInternalRequestAPI(ctx, reqURL, "POST", opts)
-	req.SetReadWriteTimeout(time.Duration(60+len(opts.OldCommitIDs)) * time.Second)
+
+	timeout := getHookRequestTimeout(opts)
+	req.SetReadWriteTimeout(timeout)
+
 	return requestJSONResp(req, &HookProcReceiveResult{})
 }
 
@@ -127,3 +135,8 @@ func SSHLog(ctx context.Context, isErr bool, msg string) error {
 	_, extra := requestJSONResp(req, &ResponseText{})
 	return extra.Error
 }
+
+// Gets the timeout (seconds) for the requests made to the internal hook api
+func getHookRequestTimeout(opts HookOptions) time.Duration {
+	return time.Duration(setting.Git.Timeout.Default) * time.Second
+}