Revision 66e40fd6
b/src/Ganeti/Config.hs | ||
---|---|---|
55 | 55 |
) where |
56 | 56 |
|
57 | 57 |
import Control.Monad (liftM) |
58 |
import Control.Monad.IO.Class (liftIO) |
|
58 | 59 |
import Data.List (foldl', nub) |
59 | 60 |
import qualified Data.Map as M |
60 | 61 |
import qualified Data.Set as S |
... | ... | |
75 | 76 |
getNdParamsOf :: ConfigData -> a -> Maybe FilledNDParams |
76 | 77 |
|
77 | 78 |
-- | Reads the config file. |
78 |
readConfig :: FilePath -> IO String
|
|
79 |
readConfig = readFile |
|
79 |
readConfig :: FilePath -> IO (Result String)
|
|
80 |
readConfig = runResultT . liftIO . readFile
|
|
80 | 81 |
|
81 | 82 |
-- | Parses the configuration file. |
82 | 83 |
parseConfig :: String -> Result ConfigData |
... | ... | |
84 | 85 |
|
85 | 86 |
-- | Wrapper over 'readConfig' and 'parseConfig'. |
86 | 87 |
loadConfig :: FilePath -> IO (Result ConfigData) |
87 |
loadConfig = fmap parseConfig . readConfig
|
|
88 |
loadConfig = fmap (>>= parseConfig) . readConfig
|
|
88 | 89 |
|
89 | 90 |
-- * Query functions |
90 | 91 |
|
Also available in: Unified diff