Simpler flushing of responses using blaze.

jamwt · Aug 28, 2012 · f232697 · f232697
1 parent 6cb9fc7
commit f232697
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/scalable-server.cabal b/scalable-server.cabal
@@ -3,7 +3,7 @@ Name:                scalable-server
 Synopsis:            Library for writing fast/scalable TCP-based services
 Description:         Library for writing fast/scalable TCP-based services
 
-Version:             0.3.0
+Version:             0.3.1
 
 License:             BSD3
 
@@ -36,7 +36,6 @@ Library
                  conduit>=0.5&&<0.6,
                  network-conduit>=0.5&&<0.6,
                  attoparsec-conduit>=0.5&&<0.6,
-                 blaze-builder-conduit>=0.5&&<0.6
 
   Extensions:    ScopedTypeVariables
   ghc-options:   -O2
diff --git a/src/Network/Server/ScalableServer.hs b/src/Network/Server/ScalableServer.hs
@@ -6,13 +6,12 @@ module Network.Server.ScalableServer (
     RequestPipeline(..), RequestCreator,
     RequestProcessor) where
 
-import Blaze.ByteString.Builder (Builder)
+import Blaze.ByteString.Builder (Builder, toByteString)
 import Data.ByteString
 import Data.Conduit
 import Data.Conduit.List as CL
 import Data.Conduit.Network
 import Data.Conduit.Attoparsec
-import Data.Conduit.Blaze
 import Network.BSD
 import qualified Data.Attoparsec as Atto
 
@@ -57,6 +56,5 @@ runServer pipe port = do
 processRequest :: RequestPipeline a -> Source IO ByteString -> Sink ByteString IO () -> IO ()
 processRequest (RequestPipeline parser handler) source sink = do
     source $$ (conduitParser parser) =$= CL.map snd =$=
-        CL.mapM handler =$=
-        builderToByteStringWith (allNewBuffersStrategy 0) =$
+        CL.mapM handler =$= CL.map toByteString =$=
         sink