Merge pull request #290 from ddvk/fixsync

ddvk · web-flow · commit 639984c95fdb · 2023-01-01T23:37:55.000+01:00
fix: capture loop variable, should fix #285
diff --git a/api/sync15/common.go b/api/sync15/common.go
@@ -41,7 +41,7 @@ func getCachedTreePath() (string, error) {
 	return cacheFile, nil
 }
 
-const cacheVersion = 2
+const cacheVersion = 3
 
 func loadTree() (*HashTree, error) {
 	cacheFile, err := getCachedTreePath()
diff --git a/api/sync15/tree.go b/api/sync15/tree.go
@@ -212,8 +212,9 @@ func (t *HashTree) Mirror(r RemoteStorage, maxconcurrent int) error {
 			if entry.Hash != doc.Hash {
 				log.Info.Println("doc updated: ", doc.DocumentID)
 				e := entry
+				d := doc
 				wg.Go(func() error {
-					return doc.Mirror(e, r)
+					return d.Mirror(e, r)
 				})
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func getCachedTreePath() (string, error) {`
`41`	`41`	`return cacheFile, nil`
`42`	`42`	`}`
`43`	`43`
`44`		`-const cacheVersion = 2`
	`44`	`+const cacheVersion = 3`
`45`	`45`
`46`	`46`	`func loadTree() (*HashTree, error) {`
`47`	`47`	`cacheFile, err := getCachedTreePath()`
Original file line number	Diff line number	Diff line change
`@@ -212,8 +212,9 @@ func (t *HashTree) Mirror(r RemoteStorage, maxconcurrent int) error {`
`212`	`212`	`if entry.Hash != doc.Hash {`
`213`	`213`	`log.Info.Println("doc updated: ", doc.DocumentID)`
`214`	`214`	`e := entry`
	`215`	`+ d := doc`
`215`	`216`	`wg.Go(func() error {`
`216`		`- return doc.Mirror(e, r)`
	`217`	`+ return d.Mirror(e, r)`
`217`	`218`	`})`
`218`	`219`	`}`
`219`	`220`	`}`