summaryrefslogtreecommitdiff
path: root/src/Utility/ThreadScheduler.hs
diff options
context:
space:
mode:
authorJoey Hess2015-01-06 19:07:40 -0400
committerJoey Hess2015-01-06 19:07:40 -0400
commit16a5f561f52f35f95a59976b5ee61d99945b0d55 (patch)
tree791803645efedbc481cafcd907d2bcf73c03d1af /src/Utility/ThreadScheduler.hs
parentf4a57ca27d2009b3069c6b33904d198e6aa73f79 (diff)
Merge Utiity modules from git-annex.
Except for a few that are using the other exception handling library, that propellor has not switched to yet.
Diffstat (limited to 'src/Utility/ThreadScheduler.hs')
-rw-r--r--src/Utility/ThreadScheduler.hs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Utility/ThreadScheduler.hs b/src/Utility/ThreadScheduler.hs
index eb009742..e6a81aeb 100644
--- a/src/Utility/ThreadScheduler.hs
+++ b/src/Utility/ThreadScheduler.hs
@@ -1,6 +1,6 @@
{- thread scheduling
-
- - Copyright 2012, 2013 Joey Hess <id@joeyh.name>
+ - Copyright 2012, 2013 Joey Hess <joey@kitenet.net>
- Copyright 2011 Bas van Dijk & Roel van Dijk
-
- License: BSD-2-clause
@@ -57,8 +57,7 @@ unboundDelay time = do
waitForTermination :: IO ()
waitForTermination = do
#ifdef mingw32_HOST_OS
- runEvery (Seconds 600) $
- void getLine
+ forever $ threadDelaySeconds (Seconds 6000)
#else
lock <- newEmptyMVar
let check sig = void $