cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2015-01-01 13:34:02 -04:00
parent 72b7b06525
commit b059ae4c77
Failed to extract signature
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Propellor/Spin.hs
View File

@ -96,19 +96,19 @@ spin target relay hst = do
-- the host in it at all, use one of the Host's IPs instead. -- the host in it at all, use one of the Host's IPs instead.
getSshTarget :: HostName -> Host -> IO String getSshTarget :: HostName -> Host -> IO String
getSshTarget target hst getSshTarget target hst
| isJust configip = go =<< catchMaybeIO (BSD.getHostByName target) | isJust configip = go =<< tryIO (BSD.getHostByName target)
| otherwise = return target | otherwise = return target
where where
go Nothing = useip go (Left e) = useip (show e)
go (Just hostentry) = maybe useip (const $ return target) go (Right hostentry) = maybe (useip $ "none matching " ++ fromMaybe "missing" configip) (const $ return target)
=<< firstM matchingtarget (BSD.hostAddresses hostentry) =<< firstM matchingtarget (BSD.hostAddresses hostentry)
matchingtarget a = (==) target <$> inet_ntoa a matchingtarget a = (==) target <$> inet_ntoa a
useip = case configip of useip why = case configip of
Nothing -> return target Nothing -> return target
Just ip -> do Just ip -> do
warningMessage $ "DNS seems out of date for " ++ target ++ "; using IP address from configuration instead." warningMessage $ "DNS seems out of date for " ++ target ++ "(" ++ why ++ "); using IP address from configuration instead."
return ip return ip
configip = case mapMaybe getIPAddr (S.toList (_dns (hostInfo hst))) of configip = case mapMaybe getIPAddr (S.toList (_dns (hostInfo hst))) of