Merge pull request #51 from utilitywarehouse/as-small-updates

adjust time-out duration for rate limit

Author: asiyani

config.go

@@ -19,7 +19,7 @@ import (
 const (
 	defaultGitGC             = "always"
 	defaultInterval          = time.Minute
-	defaultMirrorTimeout     = 2 * time.Minute
+	defaultMirrorTimeout     = 4 * time.Minute // git operations can be delayed by server when rate limited
 	defaultSSHKeyPath        = "/etc/git-secret/ssh"
 	defaultSSHKnownHostsPath = "/etc/git-secret/known_hosts"
 )

pkg/mirror/helper.go

@@ -200,7 +200,7 @@ func runGitCommand(ctx context.Context, log *slog.Logger, envs []string, cwd str
 	log.Log(ctx, -8, "running command", "cwd", cwd, "cmd", cmdStr)
 
 	cmd := exec.CommandContext(ctx, gitExecutablePath, args...)
-	// force kill git 5 seconds after sending it sigterm
+	// force kill git & child process 5 seconds after sending it sigterm (when ctx is cancelled/timed out)
 	cmd.WaitDelay = 5 * time.Second
 	if cwd != "" {
 		cmd.Dir = cwd

pkg/mirror/repository.go

@@ -398,9 +398,6 @@ func (r *Repository) StartLoop(ctx context.Context) {
 		mCtx, cancel := context.WithTimeout(ctx, r.mirrorTimeout)
 		err := r.Mirror(mCtx)
 		cancel()
-		if err != nil {
-			r.log.Error("repository mirror failed", "err", err)
-		}
 		recordGitMirror(r.gitURL.Repo, err == nil)
 
 		t := time.NewTimer(jitter(r.interval, 0.2))