Skip to content

Fix handling of rate limit by checking response headers in transport #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 17, 2019
Merged

Fix handling of rate limit by checking response headers in transport #51

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7dadac6
Fix handling of rate limit by checking response headers in transport
se7entyse7en Jun 25, 2019
5acc8d7
Readded check for abuse
se7entyse7en Jun 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions utils/rate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package utils

import (
"bytes"
"fmt"
"io"
"io/ioutil"
"log"
"net/http"
"strconv"
"sync"
"time"

Expand Down Expand Up @@ -77,23 +77,37 @@ func (rlt *rateLimitTransport) RoundTrip(req *http.Request) (*http.Response, err
return rlt.RoundTrip(req)
}

if rlErr, ok := ghErr.(*github.RateLimitError); ok {
if resp.Header.Get("X-RateLimit-Remaining") == "0" {
rlt.delayNextRequest = false
retryAfter := rlErr.Rate.Reset.Sub(time.Now())

if retryAfter < 0 {
fmt.Println("what!", rlErr.Rate.Reset, time.Now())
var limit int
if limitHeader := resp.Header.Get("X-RateLimit-Limit"); limitHeader != "" {
limit, _ = strconv.Atoi(limitHeader)
}

var reset github.Timestamp
if resetHeader := resp.Header.Get("X-RateLimit-Reset"); resetHeader != "" {
if v, _ := strconv.ParseInt(resetHeader, 10, 64); v != 0 {
reset = github.Timestamp{time.Unix(v, 0)}
}
}

retryAfter := reset.Sub(time.Now())

log.Printf("[DEBUG] Rate limit %d reached, sleeping for %s before retrying",
rlErr.Rate.Limit, retryAfter)
time.Sleep(retryAfter)
limit, retryAfter)
if retryAfter < 0 {
log.Printf("[WARN] retryAfter < 0. reset: %v | now: %v",
reset, time.Now())
} else {
time.Sleep(retryAfter)
}

rlt.unlock(req)
return rlt.RoundTrip(req)
}

rlt.unlock(req)

return resp, nil
}

Expand Down