Move ACD Connection-limiter into Pacer.

amazonclouddrive/amazonclouddrive.go

@@ -82,12 +82,11 @@ func init() {
 
 // FsAcd represents a remote acd server
 type FsAcd struct {
-	name       string             // name of this remote
-	c          *acd.Client        // the connection to the acd server
-	root       string             // the path we are working on
-	dirCache   *dircache.DirCache // Map of directory path to directory id
-	pacer      *pacer.Pacer       // pacer for API calls
-	connTokens chan struct{}      // Connection tokens for directory listings
+	name     string             // name of this remote
+	c        *acd.Client        // the connection to the acd server
+	root     string             // the path we are working on
+	dirCache *dircache.DirCache // Map of directory path to directory id
+	pacer    *pacer.Pacer       // pacer for API calls
 }
 
 // FsObjectAcd describes a acd object
@@ -170,16 +169,10 @@ func NewFs(name, root string) (fs.Fs, error) {
 	c := acd.NewClient(oAuthClient)
 	c.UserAgent = fs.UserAgent
 	f := &FsAcd{
-		name:       name,
-		root:       root,
-		c:          c,
-		pacer:      pacer.New().SetMinSleep(minSleep).SetMaxSleep(maxSleep).SetDecayConstant(decayConstant),
-		connTokens: make(chan struct{}, fs.Config.Checkers),
-	}
-
-	// Insert connection tokens.
-	for i := 0; i < fs.Config.Checkers; i++ {
-		f.connTokens <- struct{}{}
+		name:  name,
+		root:  root,
+		c:     c,
+		pacer: pacer.New().SetMinSleep(minSleep).SetMaxSleep(maxSleep).SetDecayConstant(decayConstant),
 	}
 
 	// Update endpoints
@@ -332,14 +325,10 @@ func (f *FsAcd) listAll(dirId string, title string, directoriesOnly bool, filesO
 OUTER:
 	for {
 		var resp *http.Response
-		// Get a token
-		_ = <-f.connTokens
 		err = f.pacer.Call(func() (bool, error) {
 			nodes, resp, err = f.c.Nodes.GetNodes(&opts)
 			return shouldRetry(resp, err)
 		})
-		// Reinsert token
-		f.connTokens <- struct{}{}
 		if err != nil {
 			fs.Stats.Error()
 			fs.ErrorLog(f, "Couldn't list files: %v", err)