Skip to content

Commit

Permalink
SafeRountripper -> SafeRoundtripper
Browse files Browse the repository at this point in the history
  • Loading branch information
kitop committed Nov 12, 2019
1 parent b19c8f5 commit 98342c6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions api/helpers.go
Expand Up @@ -188,7 +188,7 @@ func (no noLocalTransport) RoundTrip(req *http.Request) (*http.Response, error)
return no.inner.RoundTrip(req) return no.inner.RoundTrip(req)
} }


func SafeRountripper(trans http.RoundTripper, log logrus.FieldLogger) http.RoundTripper { func SafeRoundtripper(trans http.RoundTripper, log logrus.FieldLogger) http.RoundTripper {
if trans == nil { if trans == nil {
trans = http.DefaultTransport trans = http.DefaultTransport
} }
Expand All @@ -202,7 +202,7 @@ func SafeRountripper(trans http.RoundTripper, log logrus.FieldLogger) http.Round
} }


func SafeHTTPClient(client *http.Client, log logrus.FieldLogger) *http.Client { func SafeHTTPClient(client *http.Client, log logrus.FieldLogger) *http.Client {
client.Transport = SafeRountripper(client.Transport, log) client.Transport = SafeRoundtripper(client.Transport, log)


return client return client
} }
4 changes: 2 additions & 2 deletions api/hooks.go
Expand Up @@ -14,8 +14,8 @@ import (
"time" "time"


jwt "github.com/dgrijalva/jwt-go" jwt "github.com/dgrijalva/jwt-go"
"github.com/pkg/errors"
"github.com/gobuffalo/uuid" "github.com/gobuffalo/uuid"
"github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"


"github.com/netlify/gotrue/conf" "github.com/netlify/gotrue/conf"
Expand Down Expand Up @@ -75,7 +75,7 @@ func (w *Webhook) trigger() (io.ReadCloser, error) {
client := http.Client{ client := http.Client{
Timeout: timeout, Timeout: timeout,
} }
client.Transport = SafeRountripper(client.Transport, hooklog) client.Transport = SafeRoundtripper(client.Transport, hooklog)


for i := 0; i < w.Retries; i++ { for i := 0; i < w.Retries; i++ {
hooklog = hooklog.WithField("attempt", i+1) hooklog = hooklog.WithField("attempt", i+1)
Expand Down
6 changes: 3 additions & 3 deletions mailer/mailme.go
Expand Up @@ -115,7 +115,7 @@ func (t *TemplateCache) Set(key, value string, expirationTime time.Duration) (*t


func (t *TemplateCache) fetchTemplate(url string, triesLeft int) (string, error) { func (t *TemplateCache) fetchTemplate(url string, triesLeft int) (string, error) {
client := &http.Client{} client := &http.Client{}
client.Transport = SafeRountripper(client.Transport, logrus.New()) client.Transport = SafeRoundtripper(client.Transport, logrus.New())


resp, err := client.Get(url) resp, err := client.Get(url)
if err != nil && triesLeft > 0 { if err != nil && triesLeft > 0 {
Expand Down Expand Up @@ -251,7 +251,7 @@ func (no noLocalTransport) RoundTrip(req *http.Request) (*http.Response, error)
return no.inner.RoundTrip(req) return no.inner.RoundTrip(req)
} }


func SafeRountripper(trans http.RoundTripper, log logrus.FieldLogger) http.RoundTripper { func SafeRoundtripper(trans http.RoundTripper, log logrus.FieldLogger) http.RoundTripper {
if trans == nil { if trans == nil {
trans = http.DefaultTransport trans = http.DefaultTransport
} }
Expand All @@ -265,7 +265,7 @@ func SafeRountripper(trans http.RoundTripper, log logrus.FieldLogger) http.Round
} }


func SafeHTTPClient(client *http.Client, log logrus.FieldLogger) *http.Client { func SafeHTTPClient(client *http.Client, log logrus.FieldLogger) *http.Client {
client.Transport = SafeRountripper(client.Transport, log) client.Transport = SafeRoundtripper(client.Transport, log)


return client return client
} }

0 comments on commit 98342c6

Please sign in to comment.