mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

forgot to delay for 1 second in busy wait loop

Browse source
This commit is contained in:
Joey Hess 2014-01-08 19:58:47 -04:00
commit d8fb366cf7
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Remote/Tahoe.hs
View file

@ -39,6 +39,7 @@ import Logs.RemoteState
import Utility.UserInfo import Utility.UserInfo
import Utility.Metered import Utility.Metered
import Utility.Env import Utility.Env
import Utility.ThreadScheduler
{- The TMVar is left empty until tahoe has been verified to be running. -} {- The TMVar is left empty until tahoe has been verified to be running. -}
data TahoeHandle = TahoeHandle TahoeConfigDir (TMVar ()) data TahoeHandle = TahoeHandle TahoeConfigDir (TMVar ())
@ -170,7 +171,9 @@ getSharedConvergenceSecret configdir = go (60 :: Int)
case v of case v of
Just s | "\n" `isSuffixOf` s || "\r" `isSuffixOf` s -> Just s | "\n" `isSuffixOf` s || "\r" `isSuffixOf` s ->
return $ takeWhile (`notElem` "\n\r") s return $ takeWhile (`notElem` "\n\r") s
_ -> go (n - 1) _ -> do
threadDelaySeconds (Seconds 1)
go (n - 1)
convergenceFile :: TahoeConfigDir -> FilePath convergenceFile :: TahoeConfigDir -> FilePath
convergenceFile configdir = configdir </> "private" </> "convergence" convergenceFile configdir = configdir </> "private" </> "convergence"