haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More EnvUsage constructors

Browse Source
This commit is contained in:
Michael Snoyman 2014-11-20 09:48:22 +02:00
parent a0836cf955
commit 5a4ebf394d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
yesod/Yesod/Default/Config2.hs
View File

@ -81,7 +81,11 @@ applyCurrentEnv :: Bool -- ^ require an environment variable to be present?
-> Value -> IO Value -> Value -> IO Value
applyCurrentEnv requireEnv orig = flip (applyEnv requireEnv) orig <$> getCurrentEnv applyCurrentEnv requireEnv orig = flip (applyEnv requireEnv) orig <$> getCurrentEnv
data EnvUsage = IgnoreEnv | UseEnv | RequireEnv data EnvUsage = IgnoreEnv
| UseEnv
| RequireEnv
| UseCustomEnv (H.HashMap Text Text)
| RequireCustomEnv (H.HashMap Text Text)
-- | Load the settings from the following three sources: -- | Load the settings from the following three sources:
-- --
@ -113,6 +117,8 @@ loadAppSettings runTimeFiles compileValues envUsage = do
IgnoreEnv -> return $ applyEnv False mempty value' IgnoreEnv -> return $ applyEnv False mempty value'
UseEnv -> applyCurrentEnv False value' UseEnv -> applyCurrentEnv False value'
RequireEnv -> applyCurrentEnv True value' RequireEnv -> applyCurrentEnv True value'
UseCustomEnv env -> return $ applyEnv False env value'
RequireCustomEnv env -> return $ applyEnv True env value'
case fromJSON value of case fromJSON value of
Error s -> error $ "Could not convert to AppSettings: " ++ s Error s -> error $ "Could not convert to AppSettings: " ++ s