haskell/stackage-server
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage-server.git synced 2026-02-20 06:45:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

More timeouts

Browse Source
This commit is contained in:
Michael Snoyman 2020-10-27 14:11:55 +02:00
parent 615667401f
commit 722f441d65
No known key found for this signature in database
GPG Key ID: 907EAE2F42B52046
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Handler/Package.hs
View File

@ -76,11 +76,19 @@ checkSpam pname inner = do
packagePage :: Maybe SnapshotPackageInfo -> PackageNameP -> Handler Html packagePage :: Maybe SnapshotPackageInfo -> PackageNameP -> Handler Html
packagePage mspi pname = packagePage mspi pname =
track "Handler.Package.packagePage" $ track "Handler.Package.packagePage" $
checkSpam pname $ checkSpam pname $ do
maybe (getSnapshotPackageLatestVersion pname) (return . Just) mspi >>= \case mspi' <-
case mspi of
Just spi -> pure $ Just spi
Nothing ->
fmap join $ timeout 2000000 $ getSnapshotPackageLatestVersion pname
case mspi' of
Nothing -> do Nothing -> do
hci <- run (getHackageLatestVersion pname) >>= maybe notFound pure mmhci <- timeout 2000000 $ run $ getHackageLatestVersion pname
handlePackage $ Left hci case mmhci of
Nothing -> error "Getting latest version timed out"
Just Nothing -> notFound
Just (Just hci) -> handlePackage $ Left hci
Just spi -> handlePackage $ Right spi Just spi -> handlePackage $ Right spi