kubernetes
/
git-sync
mirror of https://github.com/kubernetes/git-sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix context cancelling

This commit is contained in:
George Angel 2019-01-02 22:00:08 +00:00
parent db07a432cd
commit 5a2584188f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/git-sync/main.go
View File

@ -185,7 +185,6 @@ func main() {
failCount := 0 failCount := 0
for { for {
ctx, cancel := context.WithTimeout(context.Background(), time.Second*time.Duration(*flSyncTimeout)) ctx, cancel := context.WithTimeout(context.Background(), time.Second*time.Duration(*flSyncTimeout))
defer cancel()
err := syncRepo(ctx, *flRepo, *flBranch, *flRev, *flDepth, *flRoot, *flDest) err := syncRepo(ctx, *flRepo, *flBranch, *flRev, *flDepth, *flRoot, *flDest)
if err != nil { if err != nil {
if initialSync || failCount >= *flMaxSyncFailures { if initialSync || failCount >= *flMaxSyncFailures {
@ -196,6 +195,7 @@ func main() {
failCount++ failCount++
log.Errorf("unexpected error syncing repo: %v", err) log.Errorf("unexpected error syncing repo: %v", err)
log.V(0).Infof("waiting %v before retrying", waitTime(*flWait)) log.V(0).Infof("waiting %v before retrying", waitTime(*flWait))
cancel()
time.Sleep(waitTime(*flWait)) time.Sleep(waitTime(*flWait))
continue continue
} }
@ -215,6 +215,7 @@ func main() {
failCount = 0 failCount = 0
log.V(1).Infof("next sync in %v", waitTime(*flWait)) log.V(1).Infof("next sync in %v", waitTime(*flWait))
cancel()
time.Sleep(waitTime(*flWait)) time.Sleep(waitTime(*flWait))
} }
} }