defer mutex unlock

pkg/vfs/download_store.go

@@ -54,18 +54,19 @@ func cleanStore(s *memStore) {
 
 func cleanDownloadStore() {
 	storeStoreMutex.Lock()
+	defer storeStoreMutex.Unlock()
 	for i, s := range storeStore {
 		cleanStore(s)
 		if len(s.Files) == 0 && len(s.Archives) == 0 {
 			delete(storeStore, i)
 		}
 	}
-	storeStoreMutex.Unlock()
 }
 
 // GetStore returns the DownloadStore for the given Instance
 func GetStore(domain string) DownloadStore {
 	storeStoreMutex.Lock()
+	defer storeStoreMutex.Unlock()
 	if storeStore == nil {
 		storeStore = make(map[string]*memStore)
 	}
@@ -78,7 +79,6 @@ func GetStore(domain string) DownloadStore {
 		}
 		storeStore[domain] = store
 	}
-	storeStoreMutex.Unlock()
 	return store
 }
 
@@ -98,25 +98,26 @@ func (s *memStore) AddFile(f string) (string, error) {
 		ExpiresAt: time.Now().Add(downloadStoreTTL),
 	}
 	s.Mutex.Lock()
+	defer s.Mutex.Unlock()
 	cleanStore(s)
 	key := s.makeSecret()
 	s.Files[key] = fref
-	s.Mutex.Unlock()
 	return key, nil
 }
 
 func (s *memStore) AddArchive(a *Archive) (string, error) {
 	a.ExpiresAt = time.Now().Add(downloadStoreTTL)
 	s.Mutex.Lock()
+	defer s.Mutex.Unlock()
 	cleanStore(s)
 	key := s.makeSecret()
 	s.Archives[key] = a
-	s.Mutex.Unlock()
 	return key, nil
 }
 
 func (s *memStore) GetFile(k string) (string, error) {
 	s.Mutex.Lock()
+	defer s.Mutex.Unlock()
 	f, ok := s.Files[k]
 	if !ok {
 		return "", nil
@@ -125,12 +126,12 @@ func (s *memStore) GetFile(k string) (string, error) {
 		delete(s.Files, k)
 		return "", nil
 	}
-	s.Mutex.Unlock()
 	return f.Path, nil
 }
 
 func (s *memStore) GetArchive(k string) (*Archive, error) {
 	s.Mutex.Lock()
+	defer s.Mutex.Unlock()
 	a, ok := s.Archives[k]
 	if !ok {
 		return nil, nil
@@ -139,6 +140,5 @@ func (s *memStore) GetArchive(k string) (*Archive, error) {
 		delete(s.Files, k)
 		return nil, nil
 	}
-	s.Mutex.Unlock()
 	return a, nil
 }