diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-09-08 15:07:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-09-08 15:07:44 -0400 |
| commit | 0f0c7f8d701f813f226424d5ae2f21f40a983536 (patch) | |
| tree | 607f274278fd76ff48ca774bd971f2c2256cb7e7 /Assistant.hs | |
| parent | aa0227958eeb5fb1580bbd461340c6d3eb4be611 (diff) | |
added pair listener thread
Diffstat (limited to 'Assistant.hs')
| -rw-r--r-- | Assistant.hs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Assistant.hs b/Assistant.hs index 7f38fdf25..0141f5f56 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -63,8 +63,10 @@ - Thread 16: TransferScanner - Does potentially expensive checks to find data that needs to be - transferred from or to remotes, and queues Transfers. - - Uses the ScanRemotes map. - - Thread 17: WebApp + - Uses the ScanRemotes map.a + - Thread 17: PairListener + - Listens for incoming pairing traffic, and takes action. + - Thread 18: WebApp - Spawns more threads as necessary to handle clients. - Displays the DaemonStatus. - @@ -124,6 +126,9 @@ import Assistant.Threads.TransferScanner import Assistant.Threads.TransferPoller #ifdef WITH_WEBAPP import Assistant.Threads.WebApp +#ifdef WITH_PAIRING +import Assistant.Threads.PairListener +#endif #else #warning Building without the webapp. You probably need to install Yesod.. #endif @@ -169,6 +174,9 @@ startAssistant assistant daemonize webappwaiter = do [ watch $ commitThread st changechan commitchan transferqueue dstatus #ifdef WITH_WEBAPP , assist $ webAppThread (Just st) dstatus scanremotes transferqueue transferslots Nothing webappwaiter +#ifdef WITH_PAIRING + , assist $ pairListenerThread st dstatus +#endif #endif , assist $ pushThread st dstatus commitchan pushmap , assist $ pushRetryThread st dstatus pushmap |