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

add clusters to proxy log

Browse source 
Note that it's not defined what will happen if a cluster has the same
name as a remote that has proxying enabled.
This commit is contained in:
Joey Hess 2024-06-14 15:03:20 -04:00
parent bbf261487d
commit 2028ad02b8
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Command/UpdateProxy.hs
View file

@ -8,11 +8,13 @@
module Command.UpdateProxy where module Command.UpdateProxy where
import Command import Command
import qualified Annex
import Logs.Proxy import Logs.Proxy
import Annex.UUID import Annex.UUID
import qualified Remote as R import qualified Remote as R
import qualified Types.Remote as R import qualified Types.Remote as R
import Utility.SafeOutput import Utility.SafeOutput
import Types.Cluster
import qualified Data.Map as M import qualified Data.Map as M
import qualified Data.Set as S import qualified Data.Set as S
@ -28,9 +30,12 @@ seek = withNothing (commandAction start)
start :: CommandStart start :: CommandStart
start = startingCustomOutput (ActionItemOther Nothing) $ do start = startingCustomOutput (ActionItemOther Nothing) $ do
rs <- R.remoteList rs <- R.remoteList
let proxies = S.fromList $ let remoteproxies = S.fromList $ map mkproxy $
map (\r -> Proxy (R.uuid r) (R.name r)) $ filter (isproxy . R.gitconfig) rs
filter (isproxy . R.gitconfig) rs clusterproxies <-
(S.fromList . map mkclusterproxy . M.toList . annexClusters)
<$> Annex.getGitConfig
let proxies = remoteproxies <> clusterproxies
u <- getUUID u <- getUUID
oldproxies <- fromMaybe mempty . M.lookup u <$> getProxies oldproxies <- fromMaybe mempty . M.lookup u <$> getProxies
if oldproxies == proxies if oldproxies == proxies
@ -52,3 +57,8 @@ start = startingCustomOutput (ActionItemOther Nothing) $ do
_ -> noop _ -> noop
isproxy c = remoteAnnexProxy c || not (null (remoteAnnexClusterNode c)) isproxy c = remoteAnnexProxy c || not (null (remoteAnnexClusterNode c))
mkproxy r = Proxy (R.uuid r) (R.name r)
mkclusterproxy (remotename, cu) =
Proxy (fromClusterUUID cu) remotename