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

Disambiguate a name

Browse Source
This commit is contained in:
Michael Snoyman 2014-11-23 22:40:42 +02:00
parent 846033b176
commit 4b1966473e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ module Yesod.Default.Config2
( MergedValue (..) ( MergedValue (..)
, applyCurrentEnv , applyCurrentEnv
, getCurrentEnv , getCurrentEnv
, applyEnv , applyEnvValue
, loadAppSettings , loadAppSettings
, loadAppSettingsArgs , loadAppSettingsArgs
, configSettingsYml , configSettingsYml
@ -59,9 +59,9 @@ mergeValues :: Value -> Value -> Value
mergeValues (Object x) (Object y) = Object $ H.unionWith mergeValues x y mergeValues (Object x) (Object y) = Object $ H.unionWith mergeValues x y
mergeValues x _ = x mergeValues x _ = x
applyEnv :: Bool -- ^ require an environment variable to be present? applyEnvValue :: Bool -- ^ require an environment variable to be present?
-> H.HashMap Text Text -> Value -> Value -> H.HashMap Text Text -> Value -> Value
applyEnv requireEnv' env = applyEnvValue requireEnv' env =
goV goV
where where
goV (Object o) = Object $ goV <$> o goV (Object o) = Object $ goV <$> o
@ -84,7 +84,7 @@ getCurrentEnv = fmap (H.fromList . map (pack *** pack)) getEnvironment
applyCurrentEnv :: Bool -- ^ require an environment variable to be present? 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 (applyEnvValue requireEnv') orig <$> getCurrentEnv
data EnvUsage = IgnoreEnv data EnvUsage = IgnoreEnv
| UseEnv | UseEnv
@ -129,11 +129,11 @@ loadAppSettings runTimeFiles compileValues envUsage = do
Just ne -> return $ getMergedValue $ sconcat ne Just ne -> return $ getMergedValue $ sconcat ne
value <- value <-
case envUsage of case envUsage of
IgnoreEnv -> return $ applyEnv False mempty value' IgnoreEnv -> return $ applyEnvValue 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' UseCustomEnv env -> return $ applyEnvValue False env value'
RequireCustomEnv env -> return $ applyEnv True env value' RequireCustomEnv env -> return $ applyEnvValue 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