msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

gf-server: the readData function given to getData should be m a, not IO a.

Browse Source
This commit is contained in:
bjorn
2008-08-24 20:44:30 +00:00
parent 85bfb64e2a
commit 1919fe99a6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/FastCGIUtils.hs
View File

@@ -109,15 +109,15 @@ type DataRef a = IORef (Maybe (ClockTime, a))
newDataRef :: MonadIO m => m (DataRef a) newDataRef :: MonadIO m => m (DataRef a)
newDataRef = liftIO $ newIORef Nothing newDataRef = liftIO $ newIORef Nothing
getData :: MonadIO m => (FilePath -> IO a) -> DataRef a -> FilePath -> m a getData :: MonadIO m => (FilePath -> m a) -> DataRef a -> FilePath -> m a
getData loadData ref file = liftIO $ getData loadData ref file =
do t' <- getModificationTime file do t' <- liftIO $ getModificationTime file
m <- readIORef ref m <- liftIO $ readIORef ref
case m of case m of
Just (t,x) | t' == t -> return x Just (t,x) | t' == t -> return x
_ -> do logCGI $ "Loading " ++ show file ++ "..." _ -> do logCGI $ "Loading " ++ show file ++ "..."
x <- loadData file x <- loadData file
writeIORef ref (Just (t',x)) liftIO $ writeIORef ref (Just (t',x))
return x return x
-- Logging -- Logging