yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

feat: switch to proxy when need be

Browse Source
This commit is contained in:
James Houlahan
2020-04-01 17:20:03 +02:00
parent f239e8f3bf
commit ce29d4d74e
36 changed files with 311 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/pmapi/client.go
View File

@ -99,12 +99,12 @@ type ClientConfig struct {
// Client to communicate with API.
type Client struct {
cm *ClientManager
client *http.Client
cm *ClientManager
hc *http.Client
uid string
accessToken string
userID string // Twice here because Username is not unique.
userID string
requestLocker sync.Locker
keyLocker sync.Locker
@ -120,7 +120,7 @@ type Client struct {
func newClient(cm *ClientManager, userID string) *Client {
return &Client{
cm: cm,
client: getHTTPClient(cm.GetConfig()),
hc: getHTTPClient(cm.GetConfig()),
userID: userID,
requestLocker: &sync.Mutex{},
keyLocker: &sync.Mutex{},
@ -132,12 +132,10 @@ func newClient(cm *ClientManager, userID string) *Client {
func getHTTPClient(cfg *ClientConfig) (hc *http.Client) {
hc = &http.Client{Timeout: cfg.Timeout}
if cfg.Transport == nil && defaultTransport == nil {
return
}
if defaultTransport != nil {
hc.Transport = defaultTransport
if cfg.Transport == nil {
if defaultTransport != nil {
hc.Transport = defaultTransport
}
return
}
@ -205,7 +203,7 @@ func (c *Client) doBuffered(req *http.Request, bodyBuffer []byte, retryUnauthori
}
hasBody := len(bodyBuffer) > 0
if res, err = c.client.Do(req); err != nil {
if res, err = c.hc.Do(req); err != nil {
if res == nil {
c.log.WithError(err).Error("Cannot get response")
err = ErrAPINotReachable