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

yesod-default parses DISPLAY_PORT (#459)

Browse Source
This commit is contained in:
Michael Snoyman 2012-12-12 09:11:20 +02:00
parent 3e51af2b34
commit d8a3548a11
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
yesod-default/Yesod/Default/Config.hs
View File

@ -181,7 +181,17 @@ loadConfig (ConfigSettings env parseExtra getFile getObject) = do
let host = fromString $ T.unpack $ fromMaybe "*" $ lookupScalar "host" m let host = fromString $ T.unpack $ fromMaybe "*" $ lookupScalar "host" m
mport <- parseMonad (\x -> x .: "port") m mport <- parseMonad (\x -> x .: "port") m
let approot = fromMaybe "" $ lookupScalar "approot" m let approot' = fromMaybe "" $ lookupScalar "approot" m
-- Handle the DISPLAY_PORT environment variable for yesod devel
approot <-
case T.stripSuffix ":3000" approot' of
Nothing -> return approot'
Just prefix -> do
envVars <- getEnvironment
case lookup "DISPLAY_PORT" envVars of
Nothing -> return approot'
Just p -> return $ prefix `T.append` T.pack (':' : p)
extra <- parseMonad (parseExtra env) m extra <- parseMonad (parseExtra env) m

2
yesod-default/yesod-default.cabal
View File

@ -1,5 +1,5 @@
name: yesod-default name: yesod-default
version: 1.1.2 version: 1.1.3
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Patrick Brisbin author: Patrick Brisbin