Update proxy.go

i25959341 · web-flow · commit 1e072555ecbb · 2020-05-04T21:50:45.000+01:00
diff --git a/proxy/proxy.go b/proxy/proxy.go
@@ -18,19 +18,22 @@ import (
 	"context"
 	"net/http"
 	"net/url"
-	"sync/atomic"
+	"sync"
 
 	"github.com/gocolly/colly/v2"
 )
 
 type roundRobinSwitcher struct {
 	proxyURLs []*url.URL
 	index     uint32
+	mutex     sync.Mutex
 }
 
 func (r *roundRobinSwitcher) GetProxy(pr *http.Request) (*url.URL, error) {
+	r.mutex.Lock()
 	u := r.proxyURLs[r.index%uint32(len(r.proxyURLs))]
-	atomic.AddUint32(&r.index, 1)
+	r.index = r.index + 1
+	r.mutex.Unlock()
 	ctx := context.WithValue(pr.Context(), colly.ProxyURLKey, u.String())
 	*pr = *pr.WithContext(ctx)
 	return u, nil
@@ -53,5 +56,6 @@ func RoundRobinProxySwitcher(ProxyURLs ...string) (colly.ProxyFunc, error) {
 		}
 		urls[i] = parsedU
 	}
-	return (&roundRobinSwitcher{urls, 0}).GetProxy, nil
+	var mutex sync.Mutex
+	return (&roundRobinSwitcher{urls, 0, mutex}).GetProxy, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -18,19 +18,22 @@ import (`
`18`	`18`	`"context"`
`19`	`19`	`"net/http"`
`20`	`20`	`"net/url"`
`21`		`- "sync/atomic"`
	`21`	`+ "sync"`
`22`	`22`
`23`	`23`	`"github.com/gocolly/colly/v2"`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`type roundRobinSwitcher struct {`
`27`	`27`	`proxyURLs []*url.URL`
`28`	`28`	`index uint32`
	`29`	`+ mutex sync.Mutex`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`func (r roundRobinSwitcher) GetProxy(pr http.Request) (*url.URL, error) {`
	`33`	`+ r.mutex.Lock()`
`32`	`34`	`u := r.proxyURLs[r.index%uint32(len(r.proxyURLs))]`
`33`		`- atomic.AddUint32(&r.index, 1)`
	`35`	`+ r.index = r.index + 1`
	`36`	`+ r.mutex.Unlock()`
`34`	`37`	`ctx := context.WithValue(pr.Context(), colly.ProxyURLKey, u.String())`
`35`	`38`	`pr = pr.WithContext(ctx)`
`36`	`39`	`return u, nil`
`@@ -53,5 +56,6 @@ func RoundRobinProxySwitcher(ProxyURLs ...string) (colly.ProxyFunc, error) {`
`53`	`56`	`}`
`54`	`57`	`urls[i] = parsedU`
`55`	`58`	`}`
`56`		`- return (&roundRobinSwitcher{urls, 0}).GetProxy, nil`
	`59`	`+ var mutex sync.Mutex`
	`60`	`+ return (&roundRobinSwitcher{urls, 0, mutex}).GetProxy, nil`
`57`	`61`	`}`