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

getCurrentTime only called when using sessions

Browse Source
This commit is contained in:
Michael Snoyman 2011-03-31 18:06:47 +02:00
parent 33db6ced91
commit b9e0a0d532
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Yesod/Core.hs
View File

@ -232,15 +232,16 @@ defaultYesodRunner :: Yesod master
-> GHandler a master ChooseRep -> GHandler a master ChooseRep
-> W.Application -> W.Application
defaultYesodRunner s master toMasterRoute mkey murl handler req = do defaultYesodRunner s master toMasterRoute mkey murl handler req = do
now <- liftIO getCurrentTime
let getExpires m = fromIntegral (m * 60) `addUTCTime` now let getExpires m = fromIntegral (m * 60) `addUTCTime` now
let exp' = getExpires $ clientSessionDuration master let exp' = getExpires $ clientSessionDuration master
let rh = takeWhile (/= ':') $ show $ W.remoteHost req let rh = takeWhile (/= ':') $ show $ W.remoteHost req
let host = if sessionIpAddress master then S8.pack rh else "" let host = if sessionIpAddress master then S8.pack rh else ""
let session' = session' <-
case mkey of case mkey of
Nothing -> [] Nothing -> return []
Just key -> fromMaybe [] $ do Just key -> do
now <- liftIO getCurrentTime
return $ fromMaybe [] $ do
raw <- lookup "Cookie" $ W.requestHeaders req raw <- lookup "Cookie" $ W.requestHeaders req
val <- lookup sessionName $ parseCookies raw val <- lookup sessionName $ parseCookies raw
decodeSession key now host val decodeSession key now host val