Update to http-conduit 2.2

The new `parseRequest` function doesn't throw on non-200 responses, so we don't need to account for these in the exception handler.
Zekt · Oct 14, 2016 · ccb004b · ccb004b
1 parent 32e34f4
commit ccb004b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/hakyll.cabal b/hakyll.cabal
@@ -202,7 +202,7 @@ Library
 
   If flag(checkExternal)
     Build-depends:
-      http-conduit >= 2.1    && < 2.2,
+      http-conduit >= 2.2    && < 2.3,
       http-types   >= 0.7    && < 0.10
     Cpp-options:
       -DCHECK_EXTERNAL

diff --git a/src/Hakyll/Check.hs b/src/Hakyll/Check.hs
@@ -204,7 +204,7 @@ checkExternalUrl url = do
             result <- liftIO $ try $ do
                 mgr <- Http.newManager Http.tlsManagerSettings
                 runResourceT $ do
-                    request  <- Http.parseUrl urlToCheck
+                    request  <- Http.parseRequest urlToCheck
                     response <- Http.http (settings request) mgr
                     let code = Http.statusCode (Http.responseStatus response)
                     return $ code >= 200 && code < 300
@@ -236,8 +236,7 @@ checkExternalUrl url = do
 
     -- Convert exception to a concise form
     showException e = case cast e of
-        Just (Http.StatusCodeException (Http.Status code msg) _ _) ->
-            show code ++ " " ++ unpack msg
+        Just (Http.HttpExceptionRequest _ e') -> show e'
         _ -> head $ words $ show e
 #else
 checkExternalUrl _ = return ()