Skip to content

Commit

Permalink
Get the right commit in browse link
Browse files Browse the repository at this point in the history
  • Loading branch information
hermanbanken committed May 14, 2021
1 parent 975107b commit 7ec2326
Showing 1 changed file with 28 additions and 1 deletion.
29 changes: 28 additions & 1 deletion cmd/sync/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,9 @@ func Main() {
err = nil
}
orFatal(err, "pushing")
c, _, err := client.Repositories.GetCommit(ctx, orgName, repoName, obj.Hash.String())
orFatal(err, "getting sync commit")
defer func() { log.Printf("Browse %s %q", c.GetHTMLURL(), c.Commit.GetMessage()) }()
log.Println()

// Merge if requested
Expand Down Expand Up @@ -243,7 +246,7 @@ func Main() {
err = nil
}
orFatal(err, "pushing")
c, _, err := client.Repositories.GetCommit(ctx, orgName, repoName, obj.Hash.String())
c, _, err := client.Repositories.GetCommit(ctx, orgName, repoName, mergeCommit.Hash.String())
orFatal(err, "getting custom merge commit")
defer func() { log.Printf("Browse %s %q", c.GetHTMLURL(), c.Commit.GetMessage()) }()
}
Expand Down Expand Up @@ -335,3 +338,27 @@ func firstStr(args ...string) string {
}
return ""
}

// BackoffRetried tries a function 3 times and backs off while retrying
func BackoffRetried(fn func() error) (err error) {
remaining := 3
backoff := time.Millisecond * 100
for {
// try
err = fn()
if err == nil {
return nil
}

// abort after retries
remaining--
if remaining < 0 {
break
}

// retry after sleeping
time.Sleep(backoff)
backoff = backoff * 2
}
return err
}

0 comments on commit 7ec2326

Please sign in to comment.