yogsototh/stackage-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Detect missing S3 objects #6

Browse source
This commit is contained in:
Michael Snoyman 2014-06-17 13:07:01 +03:00
parent 673dad882d
commit b176c38dbe
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Data/BlobStore.hs
View file

@ -137,7 +137,7 @@ cachedS3Store cache creds bucket prefix manager =
case msrc of case msrc of
Just src -> return $ Just src Just src -> return $ Just src
Nothing -> do Nothing -> do
liftIO $ runResourceT $ do join $ liftIO $ handle (\S3Error{} -> return $ return Nothing) $ runResourceT $ do
res <- Aws.aws res <- Aws.aws
(Aws.Configuration Aws.Timestamp creds (Aws.Configuration Aws.Timestamp creds
$ Aws.defaultLog Aws.Error) $ Aws.defaultLog Aws.Error)
@ -146,6 +146,7 @@ cachedS3Store cache creds bucket prefix manager =
(Aws.getObject bucket (toS3Path key)) (Aws.getObject bucket (toS3Path key))
gor <- Aws.readResponseIO res gor <- Aws.readResponseIO res
let fp = toFP cache key let fp = toFP cache key
liftIO $ F.createTree $ directory fp
bracketOnError bracketOnError
(liftIO $ IO.openBinaryTempFile (liftIO $ IO.openBinaryTempFile
(fpToString $ directory fp) (fpToString $ directory fp)
@ -158,7 +159,7 @@ cachedS3Store cache creds bucket prefix manager =
liftIO $ do liftIO $ do
hClose h hClose h
F.rename (fpFromString fpTmp) fp F.rename (fpFromString fpTmp) fp
storeRead' (fileStore cache) key -- FIXME optimize? return $ storeRead' (fileStore cache) key -- FIXME optimize?
else storeRead' (fileStore cache) key else storeRead' (fileStore cache) key
, storeExists' = \key -> , storeExists' = \key ->
if shouldBackup key if shouldBackup key