summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-30 17:23:42 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-30 17:23:42 -0400
commitf3888b0fb68e48f8dc5b0e73caf0af6fc9fb34b7 (patch)
tree43bb93480bae7ffe1c7cfe100803e26639fb1354
parent4318f594d544320825093de8661ed1b40e4774d5 (diff)
don't delay at startup
Still wait 1 minute after a change before waiting on the next change, but don't wait at the start, when we might get a pull that contains config changes right away.
-rw-r--r--Assistant/Threads/ConfigMonitor.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Assistant/Threads/ConfigMonitor.hs b/Assistant/Threads/ConfigMonitor.hs
index a1726a361..2d012ad80 100644
--- a/Assistant/Threads/ConfigMonitor.hs
+++ b/Assistant/Threads/ConfigMonitor.hs
@@ -38,7 +38,6 @@ configMonitorThread :: NamedThread
configMonitorThread = NamedThread "ConfigMonitor" $ loop =<< getConfigs
where
loop old = do
- liftIO $ threadDelaySeconds (Seconds 60)
waitBranchChange
new <- getConfigs
when (old /= new) $ do
@@ -49,6 +48,7 @@ configMonitorThread = NamedThread "ConfigMonitor" $ loop =<< getConfigs
{- Record a commit to get this config
- change pushed out to remotes. -}
recordCommit
+ liftIO $ threadDelaySeconds (Seconds 60)
loop new
{- Config files, and their checksums. -}