nek0/eidolon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

no deprecation

Browse source
This commit is contained in:
nek0 2016-08-27 13:41:02 +02:00
parent 6d6d9152e9
commit e31200e2e7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Application.hs
View file

@ -146,7 +146,7 @@ warpSettings foundation =
-- | For yesod devel, return the Warp settings and WAI Application. -- | For yesod devel, return the Warp settings and WAI Application.
getApplicationDev :: IO (Settings, Application) getApplicationDev :: IO (Settings, Application)
getApplicationDev = do getApplicationDev = do
settings <- loadAppSettings [configSettingsYml] [] useEnv settings <- loadYamlSettings [configSettingsYml] [] useEnv
foundation <- makeFoundation settings foundation <- makeFoundation settings
app <- makeApplication foundation app <- makeApplication foundation
wsettings <- getDevSettings $ warpSettings foundation wsettings <- getDevSettings $ warpSettings foundation
@ -160,7 +160,7 @@ develMain = develMainHelper getApplicationDev
appMain :: IO () appMain :: IO ()
appMain = do appMain = do
-- Get the settings from all relevant sources -- Get the settings from all relevant sources
settings <- loadAppSettingsArgs settings <- loadYamlSettingsArgs
-- fall back to compile-time values, set to [] to require values at runtime -- fall back to compile-time values, set to [] to require values at runtime
[configSettingsYmlValue] [configSettingsYmlValue]