summaryrefslogtreecommitdiff
path: root/Assistant.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-11-29 14:49:20 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-11-29 15:23:33 -0400
commit1407c1afd2e4a86ddd58d403cd49782784a60fcd (patch)
treec74142fcf43bece5ab21a7b0f9bdac5205d6f5dc /Assistant.hs
parentba7112ebba31192941671192fa28392101d46b98 (diff)
assistant: Retrival from glacier now handled.
Diffstat (limited to 'Assistant.hs')
-rw-r--r--Assistant.hs4
1 files changed, 4 insertions, 0 deletions
diff --git a/Assistant.hs b/Assistant.hs
index 5b3dd9cb9..a0d4ed2ff 100644
--- a/Assistant.hs
+++ b/Assistant.hs
@@ -74,6 +74,8 @@
- Thread 20: WebApp
- Spawns more threads as necessary to handle clients.
- Displays the DaemonStatus.
+ - Thread 21: Glacier
+ - Deals with retrieving files from Amazon Glacier.
-
- ThreadState: (MVar)
- The Annex state is stored here, which allows resuscitating the
@@ -136,6 +138,7 @@ import Assistant.Threads.NetWatcher
import Assistant.Threads.TransferScanner
import Assistant.Threads.TransferPoller
import Assistant.Threads.ConfigMonitor
+import Assistant.Threads.Glacier
#ifdef WITH_WEBAPP
import Assistant.WebApp
import Assistant.Threads.WebApp
@@ -208,6 +211,7 @@ startAssistant assistant daemonize webappwaiter = withThreadState $ \st -> do
, assist $ netWatcherFallbackThread
, assist $ transferScannerThread
, assist $ configMonitorThread
+ , assist $ glacierThread
, watch $ watchThread
]
liftIO waitForTermination