aboutsummaryrefslogtreecommitdiff
path: root/Assistant/Threads/ConfigMonitor.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-10-08 11:48:28 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-10-08 11:48:28 -0400
commit7ea377dadf61a4acf8ecdfec39954e7b4344c65f (patch)
treef37feed88774b13c8d503484d5e1417441d84ffb /Assistant/Threads/ConfigMonitor.hs
parent6abf023cb98a5d3b2f9fb251055270e576570983 (diff)
half way complete cronner thread to run scheduled activities
Diffstat (limited to 'Assistant/Threads/ConfigMonitor.hs')
-rw-r--r--Assistant/Threads/ConfigMonitor.hs18
1 files changed, 9 insertions, 9 deletions
diff --git a/Assistant/Threads/ConfigMonitor.hs b/Assistant/Threads/ConfigMonitor.hs
index 3d8be476e..3c1f56bb0 100644
--- a/Assistant/Threads/ConfigMonitor.hs
+++ b/Assistant/Threads/ConfigMonitor.hs
@@ -12,9 +12,9 @@ import Assistant.BranchChange
import Assistant.DaemonStatus
import Assistant.Commits
import Utility.ThreadScheduler
+import Logs
import Logs.UUID
import Logs.Trust
-import Logs.Remote
import Logs.PreferredContent
import Logs.Group
import Remote.List (remoteListRefresh)
@@ -52,12 +52,13 @@ configMonitorThread = namedThread "ConfigMonitor" $ loop =<< getConfigs
type Configs = S.Set (FilePath, String)
{- All git-annex's config files, and actions to run when they change. -}
-configFilesActions :: [(FilePath, Annex ())]
+configFilesActions :: [(FilePath, Assistant ())]
configFilesActions =
- [ (uuidLog, void uuidMapLoad)
- , (remoteLog, void remoteListRefresh)
- , (trustLog, void trustMapLoad)
- , (groupLog, void groupMapLoad)
+ [ (uuidLog, void $ liftAnnex uuidMapLoad)
+ , (remoteLog, void $ liftAnnex remoteListRefresh)
+ , (trustLog, void $ liftAnnex trustMapLoad)
+ , (groupLog, void $ liftAnnex groupMapLoad)
+ , (scheduleLog, void updateScheduleLog)
-- Preferred content settings depend on most of the other configs,
-- so will be reloaded whenever any configs change.
, (preferredContentLog, noop)
@@ -65,9 +66,8 @@ configFilesActions =
reloadConfigs :: Configs -> Assistant ()
reloadConfigs changedconfigs = do
- liftAnnex $ do
- sequence_ as
- void preferredContentMapLoad
+ sequence_ as
+ void $ liftAnnex preferredContentMapLoad
{- Changes to the remote log, or the trust log, can affect the
- syncRemotes list. Changes to the uuid log may affect its
- display so are also included. -}