Anonymous avatar Anonymous committed 5df79fd

catching up to the latest conduit.

Comments (0)

Files changed (4)

 import Control.DeepSeq (rnf)
 import Control.Exception (bracket, catch, evaluate, finally)
 import Control.Monad (forM_, unless)
+import Control.Monad.Trans.Resource (ResourceT)
 import Data.Aeson ((.=), encode, object)
 import Data.Char (toLower)
 import Data.Maybe (catMaybes)
                 &= summary ("Pronk " ++ pronk_version ++
                             " - a modern HTTP load tester")
 
-fromArgs :: Args -> E.Request IO -> LoadTest.Config
+fromArgs :: Args -> E.Request (ResourceT IO) -> LoadTest.Config
 fromArgs Args{..} req =
     LoadTest.Config {
       LoadTest.concurrency = concurrency
   forM_ problems $ hPutStrLn stderr . ("Error: " ++)
   unless (null problems) $ exitWith (ExitFailure 1)
 
-createRequest :: Args -> IO (E.Request IO)
+createRequest :: Args -> IO (E.Request (ResourceT IO))
 createRequest Args{..} = do
   req0 <- E.parseUrl url `catch` \(e::E.HttpException) ->
           fatal $ "could not parse URL - " ++

lib/Network/HTTP/LoadTest.hs

 respEvent :: Response L.ByteString -> Event
 respEvent resp =
     HttpResponse {
-      respCode = H.statusCode $ statusCode resp
+      respCode = H.statusCode $ responseStatus resp
     , respContentLength = fromIntegral . L.length . responseBody $ resp
     }

lib/Network/HTTP/LoadTest/Types.hs

 import qualified Data.Vector as V
 import qualified Data.Vector.Generic as G
 import qualified Data.Vector.Unboxed as U
+import Control.Monad.Trans.Resource (ResourceT)
 
 newtype Req = Req {
-      fromReq :: Request IO
+      fromReq :: Request (ResourceT IO)
     } deriving (Typeable)
 
 instance Show Req where
     http-conduit >= 1.2,
     http-types,
     lifted-base,
+    resourcet,
     statistics >= 0.10.0.0,
     text,
     text-format >= 0.3.0.4,
     criterion,
     deepseq,
     http-conduit,
+    network,
     pronk,
-    network,
+    resourcet,
     text,
     text-format,
     time
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.