Merge pull request #232 from jum/firestore_cleanup_fix

alexedwards · web-flow · commit 662ddf05f7b8 · 2025-02-12T12:51:30.000+01:00
Implement the race condition fix as described in #231.
diff --git a/firestore/firestore.go b/firestore/firestore.go
@@ -40,6 +40,7 @@ func NewWithCleanupInterval(client *firestore.Client, cleanupInterval time.Durat
 	}
 
 	if cleanupInterval > 0 {
+		m.stopCleanup = make(chan bool)
 		go m.startCleanup(cleanupInterval)
 	}
 
@@ -112,7 +113,6 @@ func (m *FireStore) AllCtx(ctx context.Context) (map[string][]byte, error) {
 }
 
 func (m *FireStore) startCleanup(interval time.Duration) {
-	m.stopCleanup = make(chan bool)
 	ticker := time.NewTicker(interval)
 	for {
 		select {

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ func NewWithCleanupInterval(client *firestore.Client, cleanupInterval time.Durat`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`if cleanupInterval > 0 {`
	`43`	`+ m.stopCleanup = make(chan bool)`
`43`	`44`	`go m.startCleanup(cleanupInterval)`
`44`	`45`	`}`
`45`	`46`
`@@ -112,7 +113,6 @@ func (m *FireStore) AllCtx(ctx context.Context) (map[string][]byte, error) {`
`112`	`113`	`}`
`113`	`114`
`114`	`115`	`func (m *FireStore) startCleanup(interval time.Duration) {`
`115`		`- m.stopCleanup = make(chan bool)`
`116`	`116`	`ticker := time.NewTicker(interval)`
`117`	`117`	`for {`
`118`	`118`	`select {`