diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-07-28 18:02:11 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-07-28 18:02:11 -0400 |
| commit | 3cc18857936e5a09e033439971dc9c43e6ccbaa2 (patch) | |
| tree | a817de04aa65271b3036370d447cf1b228a4bffb /Assistant/Threads/Pusher.hs | |
| parent | a17fde22fabdb706086ac945bc331e32527b58bd (diff) | |
move DaemonStatus manipulation out of the Annex monad to IO
I've convinced myself that nothing in DaemonStatus can deadlock,
as it always keepts the TMVar full. That was the only reason it was in the
Annex monad.
Diffstat (limited to 'Assistant/Threads/Pusher.hs')
| -rw-r--r-- | Assistant/Threads/Pusher.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Assistant/Threads/Pusher.hs b/Assistant/Threads/Pusher.hs index cba53af23..3762c4836 100644 --- a/Assistant/Threads/Pusher.hs +++ b/Assistant/Threads/Pusher.hs @@ -51,8 +51,7 @@ pushThread st daemonstatus commitchan pushmap = do now <- getCurrentTime if shouldPush now commits then do - remotes <- runThreadState st $ - knownRemotes <$> getDaemonStatus daemonstatus + remotes <- knownRemotes <$> getDaemonStatus daemonstatus pushToRemotes thisThread now st (Just pushmap) remotes else do debug thisThread |