Merge pull request #307 from vincentbernat/fix/defer-lock

Fix lock handling in cache flusher for API

api/api.go

@@ -32,25 +32,27 @@ func cacheFlusher() {
 	for {
 		<-ticker
 
-		// lock everything to eliminate in-progress calls
+		func() {
-		r := context.CollectionFactory().RemoteRepoCollection()
+			// lock everything to eliminate in-progress calls
-		r.Lock()
+			r := context.CollectionFactory().RemoteRepoCollection()
-		defer r.Unlock()
+			r.Lock()
+			defer r.Unlock()
 
-		l := context.CollectionFactory().LocalRepoCollection()
+			l := context.CollectionFactory().LocalRepoCollection()
-		l.Lock()
+			l.Lock()
-		defer l.Unlock()
+			defer l.Unlock()
 
-		s := context.CollectionFactory().SnapshotCollection()
+			s := context.CollectionFactory().SnapshotCollection()
-		s.Lock()
+			s.Lock()
-		defer s.Unlock()
+			defer s.Unlock()
 
-		p := context.CollectionFactory().PublishedRepoCollection()
+			p := context.CollectionFactory().PublishedRepoCollection()
-		p.Lock()
+			p.Lock()
-		defer p.Unlock()
+			defer p.Unlock()
 
-		// all collections locked, flush them
+			// all collections locked, flush them
-		context.CollectionFactory().Flush()
+			context.CollectionFactory().Flush()
+		}()
 	}
 }