Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion _deploy/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func main() {
must(err)

// Connect to zendesk
transport := BasicAuthTransport{
transport := ZendeskAuthTransport{
Username: Config.ZendeskUser + "/token",
Password: Config.ZendeskToken,
}
Expand Down
23 changes: 17 additions & 6 deletions _deploy/zendesk.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"net/http"
"os"
"path/filepath"
"strconv"
"time"
)

Expand Down Expand Up @@ -440,17 +441,27 @@ func (z *Zendesk) DeleteAttachment(attachmentID int) (err error) {
return nil
}

type BasicAuthTransport struct {
type ZendeskAuthTransport struct {
Username string
Password string
}

func (bat BasicAuthTransport) RoundTrip(req *http.Request) (*http.Response, error) {
req.SetBasicAuth(bat.Username, bat.Password)
func (z ZendeskAuthTransport) RoundTrip(req *http.Request) (*http.Response, error) {
req.SetBasicAuth(z.Username, z.Password)

return http.DefaultTransport.RoundTrip(req)
res, err := http.DefaultTransport.RoundTrip(req)
if res.StatusCode == 429 {
// we hit the rate limit, wait for the suggested seconds and retry
if waitFor, castErr := strconv.Atoi(res.Header.Get("Retry-After")); castErr == nil {
Log.Warnf("Rate limited: wait for %d seconds", waitFor)

time.Sleep(time.Duration(waitFor) * time.Second)
return http.DefaultTransport.RoundTrip(req)
}
}
return res, err
}

func (bat *BasicAuthTransport) Client() *http.Client {
return &http.Client{Transport: bat}
func (z *ZendeskAuthTransport) Client() *http.Client {
return &http.Client{Transport: z}
}