Update ev backend to the new backend API

meiersi · Nov 7, 2010 · 06e31e9 · 06e31e9
1 parent 03bbe1b
commit 06e31e9
Show file tree

Hide file tree

Showing 4 changed files with 239 additions and 348 deletions.
diff --git a/snap-server.cabal b/snap-server.cabal
@@ -112,7 +112,8 @@ Library
     Snap.Internal.Http.Server.GnuTLS,
     Snap.Internal.Http.Server.HttpPort,
     Snap.Internal.Http.Server.TimeoutTable,
-    Snap.Internal.Http.Server.SimpleBackend
+    Snap.Internal.Http.Server.SimpleBackend,
+    Snap.Internal.Http.Server.LibevBackend
 
   build-depends:
     array >= 0.2 && <0.4,
@@ -151,7 +152,6 @@ Library
 
   if flag(libev)
     build-depends: hlibev >= 0.2.8 && < 0.3
-    other-modules: Snap.Internal.Http.Server.LibevBackend
     cpp-options: -DLIBEV
 
   if flag(gnutls)

diff --git a/src/Snap/Internal/Http/Server.hs b/src/Snap/Internal/Http/Server.hs
@@ -46,6 +46,7 @@ import           Snap.Internal.Http.Server.Backend
 import           Snap.Internal.Http.Server.HttpPort
 import qualified Snap.Internal.Http.Server.GnuTLS as TLS
 import           Snap.Internal.Http.Server.SimpleBackend
+import           Snap.Internal.Http.Server.LibevBackend
 
 import           Snap.Internal.Iteratee.Debug
 import           Snap.Iteratee hiding (foldl', head, take, FileOffset)
@@ -76,7 +77,11 @@ data EventLoopType = EventLoopSimple
   deriving (Prelude.Show)
 
 defaultEvType :: EventLoopType
+#ifdef LIBEV
+defaultEvType = EventLoopLibEv
+#else
 defaultEvType = EventLoopSimple
+#endif
 
 data ServerState = ServerState
     { _forceConnectionClose  :: Bool
@@ -150,7 +155,7 @@ httpServe ports mevType localHostname alogPath elogPath handler =
 
     --------------------------------------------------------------------------
     runEventLoop EventLoopSimple       = simpleEventLoop
-    runEventLoop e = \_ _ _ _ -> throwIO $ PatternMatchFail $ Prelude.show e ++ " is not a supported backend"
+    runEventLoop EventLoopLibEv        = libEvEventLoop
 
 
     --------------------------------------------------------------------------