From 845289fdd8fbbed2cbc7eaf7a3d31efe5a8aa80d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 18 Aug 2016 16:37:23 -0400 Subject: untested moving of upload queues on to servers There needs to be a 1:1 mapping between upload queues and servers, otherwise using the upload queue risks two shards for the same object being uploaded to the same server. Also, fixed storeShards to give up on StoreAlreadyExists, rather than trying another storage location. Otherwise, on a name collision, the shards would be rejected by the servers, and be stored to their upload queues. --- keysafe.hs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'keysafe.hs') diff --git a/keysafe.hs b/keysafe.hs index c1ed35a..919150b 100644 --- a/keysafe.hs +++ b/keysafe.hs @@ -59,6 +59,8 @@ dispatch cmdline ui storagelocations tunables possibletunables = do =<< Gpg.getKeyToBackup ui go CmdLine.Restore Nothing = restore storagelocations ui possibletunables Gpg.anyKey + go CmdLine.UploadQueued _ = + uploadQueued go CmdLine.Benchmark _ = benchmarkTunables tunables -- cgit v1.2.3