diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-08-17 12:26:14 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-08-17 13:54:14 -0400 |
| commit | da0a1360d7b57d034620338996552752ab873045 (patch) | |
| tree | 7cd5d994f15ae0d52e18321a129360b9e39a6d7d /Assistant/DaemonStatus.hs | |
| parent | 13ce429b5cbc3036e24613ce85e17af7acd9a480 (diff) | |
add annex-ignore-command and annex-sync-command configs
Added remote configuration settings annex-ignore-command and
annex-sync-command, which are dynamic equivilants of the annex-ignore
and annex-sync configurations.
For this I needed a new DynamicConfig infrastructure. Its implementation
should be as fast as before when there is no dynamic config, and it caches
so shell commands are only run once.
Note that annex-ignore-command exits nonzero when the remote should be ignored.
While that may seem backwards, it allows using the same command for it as
for annex-sync-command when you want to disable both.
This commit was sponsored by Trenton Cronholm on Patreon.
Diffstat (limited to 'Assistant/DaemonStatus.hs')
| -rw-r--r-- | Assistant/DaemonStatus.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Assistant/DaemonStatus.hs b/Assistant/DaemonStatus.hs index ce5f01e27..58cb28c01 100644 --- a/Assistant/DaemonStatus.hs +++ b/Assistant/DaemonStatus.hs @@ -19,6 +19,7 @@ import Logs.Trust import Logs.TimeStamp import qualified Remote import qualified Types.Remote as Remote +import Config.DynamicConfig import Control.Concurrent.STM import System.Posix.Types @@ -47,12 +48,12 @@ modifyDaemonStatus a = do - and other associated information. -} calcSyncRemotes :: Annex (DaemonStatus -> DaemonStatus) calcSyncRemotes = do - rs <- filter (remoteAnnexSync . Remote.gitconfig) . - concat . Remote.byCost <$> Remote.remoteList + rs <- filterM (liftIO . getDynamicConfig . remoteAnnexSync . Remote.gitconfig) + =<< (concat . Remote.byCost <$> Remote.remoteList) alive <- trustExclude DeadTrusted (map Remote.uuid rs) let good r = Remote.uuid r `elem` alive let syncable = filter good rs - let syncdata = filter (not . remoteAnnexIgnore . Remote.gitconfig) $ + syncdata <- filterM (not <$$> liftIO . getDynamicConfig . remoteAnnexIgnore . Remote.gitconfig) $ filter (\r -> Remote.uuid r /= NoUUID) $ filter (not . Remote.isXMPPRemote) syncable |