aboutsummaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-08-12 12:11:20 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-08-12 12:11:20 -0400
commitb6b8f6da9ce18c92cd5c813e07f06d392731bf86 (patch)
tree897f688c4f75c0364ca01216207eae63c5d00729 /Command
parent37eed5d8d0a3affad6a6a7d0cbbfb1c1e706e635 (diff)
implement resuming of paused transfers
Currently waits for a new transfer slot to open up, which probably needs to change..
Diffstat (limited to 'Command')
-rw-r--r--Command/WebApp.hs4
1 files changed, 3 insertions, 1 deletions
diff --git a/Command/WebApp.hs b/Command/WebApp.hs
index 2b18d1b83..c8a7c7f59 100644
--- a/Command/WebApp.hs
+++ b/Command/WebApp.hs
@@ -13,6 +13,7 @@ import Assistant
import Assistant.DaemonStatus
import Assistant.ScanRemotes
import Assistant.TransferQueue
+import Assistant.TransferSlots
import Assistant.Threads.WebApp
import Utility.WebApp
import Utility.Daemon (checkDaemon, lockPidFile)
@@ -89,9 +90,10 @@ firstRun = do
dstatus <- atomically . newTMVar =<< newDaemonStatus
scanremotes <- newScanRemoteMap
transferqueue <- newTransferQueue
+ transferslots <- newTransferSlots
v <- newEmptyMVar
let callback a = Just $ a v
- webAppThread Nothing dstatus scanremotes transferqueue
+ webAppThread Nothing dstatus scanremotes transferqueue transferslots
(callback signaler) (callback mainthread)
where
signaler v = do