diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-09-08 13:04:19 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-09-08 13:04:19 -0400 |
| commit | 3dd4b4058f7796c5d08f1172fcf39c777540f80e (patch) | |
| tree | 13af8c38710f1696de04b492d44c113fa8b40440 /Assistant/DaemonStatus.hs | |
| parent | 0c01348b65bb3d0364f90ce9785236fa05985f75 (diff) | |
implement pair request broadcasts
Pair requests are sent on all network interfaces, and contain the best
available hostname to use to contact the host on that interface.
Added a pairing in progress page.
Revert "reduce some boilerplate using ghc extensions", because it caused
overlapping instances for Text.
Diffstat (limited to 'Assistant/DaemonStatus.hs')
| -rw-r--r-- | Assistant/DaemonStatus.hs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Assistant/DaemonStatus.hs b/Assistant/DaemonStatus.hs index c6942530c..4de160ace 100644 --- a/Assistant/DaemonStatus.hs +++ b/Assistant/DaemonStatus.hs @@ -9,6 +9,7 @@ module Assistant.DaemonStatus where import Common.Annex import Assistant.Alert +import Assistant.Pairing import Utility.TempFile import Utility.NotificationBroadcaster import Logs.Transfer @@ -38,6 +39,8 @@ data DaemonStatus = DaemonStatus , lastAlertId :: AlertId -- Ordered list of remotes to talk to. , knownRemotes :: [Remote] + -- Pairing requests that are in progress. + , pairingInProgress :: [PairingInProgress] -- Broadcasts notifications about all changes to the DaemonStatus , changeNotifier :: NotificationBroadcaster -- Broadcasts notifications when queued or current transfers change. @@ -61,6 +64,7 @@ newDaemonStatus = DaemonStatus <*> pure M.empty <*> pure firstAlertId <*> pure [] + <*> pure [] <*> newNotificationBroadcaster <*> newNotificationBroadcaster <*> newNotificationBroadcaster |