diff options
Diffstat (limited to 'Storage.hs')
-rw-r--r-- | Storage.hs | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -25,12 +25,10 @@ import System.Random import Control.Concurrent.Thread.Delay import Control.Concurrent.Async import qualified Data.Set as S -import Network.Wai.Handler.Warp (Port) import System.Random.Shuffle -networkStorageLocations :: Maybe LocalStorageDirectory -> IO StorageLocations -networkStorageLocations = shuffleStorageLocations - . StorageLocations . serverList +networkStorageLocations :: Maybe LocalStorageDirectory -> StorageLocations +networkStorageLocations = StorageLocations . serverList type UpdateProgress = IO () @@ -155,7 +153,8 @@ retrieveShares (StorageLocations locs) sis updateprogress = do -- | Returns descriptions of any failures. tryUploadQueued :: Maybe LocalStorageDirectory -> IO [String] tryUploadQueued d = do - StorageLocations locs <- networkStorageLocations d + StorageLocations locs <- shuffleStorageLocations $ + networkStorageLocations d results <- forM locs $ \loc -> case uploadQueue loc of Nothing -> return [] Just q -> moveShares q loc |