fix(releaseupdate): reuse a found release for ten minutes to stay under GitHub's unauthenticated rate limit
This commit is contained in:
3 files changed
+30
-4
No files matched your search
@@ -25,7 +25,7 @@ func RunUpdate(args []string, out, stderr io.Writer) int {
|
||||
if err := flags.Parse(args[1:]); err != nil {
|
||||
return 2
|
||||
}
|
||||
catalog := releaseupdate.GitHubCatalog{Channel: func(context.Context) (string, string, error) { return *channel, *pin, nil }}
|
||||
catalog := &releaseupdate.GitHubCatalog{Channel: func(context.Context) (string, string, error) { return *channel, *pin, nil }}
|
||||
snapshot, err := catalog.Check(context.Background())
|
||||
if err != nil {
|
||||
fmt.Fprintln(stderr, err)
|
||||
|
||||
@@ -123,7 +123,7 @@ type UpdateSettings struct {
|
||||
// deferrals; healthURL reaches the installer.
|
||||
func UpdateService(reader ResourceReader, statePath, healthURL string) *releaseupdate.Service {
|
||||
return &releaseupdate.Service{
|
||||
Catalog: releaseupdate.GitHubCatalog{Channel: updateChannel(reader)},
|
||||
Catalog: &releaseupdate.GitHubCatalog{Channel: updateChannel(reader)},
|
||||
Installer: releaseupdate.ScriptInstaller{HealthURL: healthURL},
|
||||
StatePath: statePath,
|
||||
InstallType: installtype.Type(),
|
||||
|
||||
@@ -8,6 +8,8 @@ import (
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/creativeprojects/go-selfupdate"
|
||||
|
||||
@@ -28,9 +30,18 @@ var buildSuffix = regexp.MustCompile(`-[0-9]+-g[0-9a-f]+$`)
|
||||
type GitHubCatalog struct {
|
||||
// Channel returns the release channel and pin in force.
|
||||
Channel func(context.Context) (channel, pin string, err error)
|
||||
|
||||
// A found release is reused for checkTTL: unauthenticated GitHub API
|
||||
// calls are limited to 60 an hour per address.
|
||||
mu sync.Mutex
|
||||
key string
|
||||
at time.Time
|
||||
release *selfupdate.Release
|
||||
}
|
||||
|
||||
func (c GitHubCatalog) Check(ctx context.Context) (Snapshot, error) {
|
||||
const checkTTL = 10 * time.Minute
|
||||
|
||||
func (c *GitHubCatalog) Check(ctx context.Context) (Snapshot, error) {
|
||||
channel, pin, err := c.Channel(ctx)
|
||||
if err != nil {
|
||||
return Snapshot{}, err
|
||||
@@ -38,7 +49,7 @@ func (c GitHubCatalog) Check(ctx context.Context) (Snapshot, error) {
|
||||
if channel == "" {
|
||||
channel = "stable"
|
||||
}
|
||||
release, err := detectRelease(ctx, channel, pin)
|
||||
release, err := c.detect(ctx, channel, pin)
|
||||
if err != nil {
|
||||
return Snapshot{}, err
|
||||
}
|
||||
@@ -55,6 +66,21 @@ func (c GitHubCatalog) Check(ctx context.Context) (Snapshot, error) {
|
||||
}}, nil
|
||||
}
|
||||
|
||||
func (c *GitHubCatalog) detect(ctx context.Context, channel, pin string) (*selfupdate.Release, error) {
|
||||
c.mu.Lock()
|
||||
defer c.mu.Unlock()
|
||||
key := channel + "\x00" + pin
|
||||
if c.release != nil && c.key == key && time.Since(c.at) < checkTTL {
|
||||
return c.release, nil
|
||||
}
|
||||
release, err := detectRelease(ctx, channel, pin)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
c.key, c.at, c.release = key, time.Now(), release
|
||||
return release, nil
|
||||
}
|
||||
|
||||
// detectRelease resolves channel to one published release. A release with no
|
||||
// zip for this platform is not installable, so it is never offered.
|
||||
func detectRelease(ctx context.Context, channel, pin string) (*selfupdate.Release, error) {
|
||||
|
||||
Reference in new issue
Block a user