A peer-to-peer stack for code collaboration
Extract machine config
Thomas Scholtesb46efc3ab59d
diff --git a/exe/Daemon.hs b/exe/Daemon.hsindex 1cc1f48..e5a1c6c 100644--- a/exe/Daemon.hs+++ b/exe/Daemon.hs@@ -5,11 +5,10 @@-- See-- <https://github.com/oscoin/radicle/blob/master/rfcs/0003-radicle-daemon.rst-- the RFC>.-module Daemon where+module Daemon (main) whereimport Protolude hiding (fromStrict, option, poll)-import qualified Data.Aeson as Aimport Data.ByteString.Lazy (fromStrict)import qualified Data.Map.Strict as Mapimport qualified Data.Text as T@@ -17,27 +16,25 @@ import qualified Data.Time.Clock.System as Timeimport Network.Wai.Handler.Warp (run)import Options.Applicativeimport Servant-import System.Directory (doesFileExist)import System.IO (BufferMode(..), hSetBuffering)import Radicle.Daemon.Common hiding (logInfo)import qualified Radicle.Daemon.Common as Common-import qualified Radicle.Internal.UUID as UUID--import Radicle hiding (Env)import qualified Radicle.Daemon.HttpApi as Apiimport Radicle.Daemon.Ipfs+import Radicle.Daemon.MachineConfigimport Radicle.Daemon.Monad++import Radicle hiding (Env)import qualified Radicle.Internal.CLI as Localimport qualified Radicle.Internal.ConcurrentMap as CMap+import qualified Radicle.Internal.UUID as UUID-- * TypeslogDaemonError :: MonadIO m => Error -> m ()logDaemonError (displayError -> (m, xs)) = logErr m xs-type Follows = Map MachineId ReaderOrWriter--- * Maindata Opts = Opts@@ -74,12 +71,12 @@ main :: IO Voidmain = dohSetBuffering stdout LineBufferingOpts{..} <- execParser allOpts- followFileLock <- newMVar ()- followFile <- Local.getRadicleFile (toS filePrefix <> "daemon-follows")+ machineConfigFileLock <- newMVar ()+ machineConfigFile <- Local.getRadicleFile (toS filePrefix <> "daemon-follows")machines <- CachedMachines <$> CMap.emptylet env = Env{ logLevel = if debug then Debug else Normal, ..}- follows <- readFollowFileIO followFileLock followFile- initRes <- runDaemon env (init follows)+ machineConfig <- readMachineConfigIO machineConfigFileLock machineConfigFile+ initRes <- runDaemon env (init machineConfig)case initRes ofLeft err -> dologDaemonError err@@ -133,7 +130,7 @@ server env = hoistServer Api.daemonApi nt daemonServer-- * Init-- | Initiate machines according to follow file.-init :: Follows -> Daemon ()+init :: MachineConfig -> Daemon ()init follows = traverse_ initMachine (Map.toList follows)whereinitMachine (id, Reader) = initReaderNoFail id@@ -151,7 +148,7 @@ newMachine = dom <- liftIO $ emptyMachine id Writer subinsertNewMachine id (Cached m)actAsWriter m- writeFollowFile+ writeMachineConfigpure (Api.NewResponse id)-- | Evaluate an expression against a cached machine. The resulting@@ -233,32 +230,6 @@ logInfo l msg infos = dothen Common.logInfo msg infoselse pure ()-withFollowFileLock :: FollowFileLock -> IO a -> IO a-withFollowFileLock lock = withMVar lock . const--readFollowFileIO :: FollowFileLock -> FilePath -> IO Follows-readFollowFileIO lock ff = withFollowFileLock lock $ do- exists <- doesFileExist ff- t <- if exists- then readFile ff- else let noFollows = toS (A.encode (Map.empty :: Follows))- in writeFile ff noFollows $> noFollows- case A.decode (toS t) of- Nothing -> panic $ "Invalid daemon-follow file: could not decode " <> toS ff- Just fs -> pure fs--writeFollowFile :: Daemon ()-writeFollowFile = do- lock <- asks followFileLock- CachedMachines cMap <- asks machines- ff <- asks followFile- liftIO $ withFollowFileLock lock $ do- ms <- CMap.nonAtomicRead cMap- let fs = mode <$> ms- writeFile ff (toS (A.encode fs))- where- mode (UninitialisedReader _) = Reader- mode (Cached c) = machineMode clookupMachine :: MachineId -> Daemon (Maybe CachedMachine)lookupMachine id = do@@ -416,7 +387,7 @@ initAsReader id = donewReader :: MachineId -> Daemon MachinenewReader id = dom <- initAsReader id- writeFollowFile+ writeMachineConfigpure m-- | Try to initiate a reader, but don't fail in case of errors; just log adiff --git a/package.yaml b/package.yamlindex 60ac22c..f248967 100644--- a/package.yaml+++ b/package.yaml@@ -138,11 +138,9 @@ executables:other-modules: []dependencies:- radicle- - aeson- mtl- containers- bytestring- - directory- optparse-applicative- servant-server- textdiff --git a/src/Radicle/Daemon/MachineConfig.hs b/src/Radicle/Daemon/MachineConfig.hsnew file mode 100644index 0000000..780dcd5--- /dev/null+++ b/src/Radicle/Daemon/MachineConfig.hs@@ -0,0 +1,49 @@+-- | This module provides disk persistence for 'MachineConfig'.+-- 'MachineConfig' tells us which machine the daemon owns and which+-- machines it follows.+module Radicle.Daemon.MachineConfig+ ( MachineConfig+ , readMachineConfigIO+ , writeMachineConfig+ ) where++import Protolude++import qualified Data.Aeson as A+import qualified Data.Map.Strict as Map+import System.Directory (doesFileExist)++import Radicle.Daemon.Common+import Radicle.Daemon.Ipfs+import Radicle.Daemon.Monad+import qualified Radicle.Internal.ConcurrentMap as CMap++-- | Holds the machines the daemon owns and follows.+type MachineConfig = Map MachineId ReaderOrWriter++readMachineConfigIO :: FileLock -> FilePath -> IO MachineConfig+readMachineConfigIO lock ff = withFileLock lock $ do+ exists <- doesFileExist ff+ t <- if exists+ then readFile ff+ else let noFollows = toS (A.encode (Map.empty :: MachineConfig))+ in writeFile ff noFollows $> noFollows+ case A.decode (toS t) of+ Nothing -> panic $ "Invalid daemon-follow file: could not decode " <> toS ff+ Just fs -> pure fs++writeMachineConfig :: Daemon ()+writeMachineConfig = do+ lock <- asks machineConfigFileLock+ CachedMachines cMap <- asks machines+ ff <- asks machineConfigFile+ liftIO $ withFileLock lock $ do+ ms <- CMap.nonAtomicRead cMap+ let fs = mode <$> ms+ writeFile ff (toS (A.encode fs))+ where+ mode (UninitialisedReader _) = Reader+ mode (Cached c) = machineMode c++withFileLock :: FileLock -> IO a -> IO a+withFileLock lock = withMVar lock . constdiff --git a/src/Radicle/Daemon/Monad.hs b/src/Radicle/Daemon/Monad.hsindex 13edfda..540cfee 100644--- a/src/Radicle/Daemon/Monad.hs+++ b/src/Radicle/Daemon/Monad.hs@@ -7,7 +7,7 @@ module Radicle.Daemon.Monad, liftExceptT, Env(..)- , FollowFileLock+ , FileLock, LogLevel(..), MachineError(..)@@ -33,16 +33,16 @@ liftExceptT makeError action = Daemon $ mapExceptT (lift . fmap (first makeError-- * Environment-type FollowFileLock = MVar ()+type FileLock = MVar ()data LogLevel = Normal | Debugderiving (Eq, Ord)data Env = Env- { followFileLock :: FollowFileLock- , followFile :: FilePath- , machines :: CachedMachines- , logLevel :: LogLevel+ { machineConfigFileLock :: FileLock+ , machineConfigFile :: FilePath+ , machines :: CachedMachines+ , logLevel :: LogLevel}-- * Errors