git.iko.soy/hakyll
on master help sign in
Bump Snap dependency
7951869Jasper Van der Jeugt
hakyll.cabal+2−2
compare with master
unifiedsplit
@@ -136,8 +136,8 @@ Library
136
136
137 If flag(previewServer)
137 If flag(previewServer)
138 Build-depends:
138 Build-depends:
139− snap-core >= 0.5.1 && < 0.6,
139+ snap-core >= 0.6 && < 0.8,
140− snap-server >= 0.5.1 && < 0.6
140+ snap-server >= 0.6 && < 0.8
141 Cpp-Options:
141 Cpp-Options:
142 -DPREVIEW_SERVER
142 -DPREVIEW_SERVER
143 Other-Modules:
143 Other-Modules:
src/Hakyll/Web/Preview/Server.hs+13−17
@@ -7,25 +7,21 @@ module Hakyll.Web.Preview.Server
7
7
8import Control.Monad.Trans (liftIO)
8import Control.Monad.Trans (liftIO)
9
9
10−import Snap.Types (Snap)
10+import qualified Snap.Core as Snap
11+import qualified Snap.Http.Server as Snap
11−import Snap.Util.FileServe ( DirectoryConfig (..), fancyDirectoryConfig
12+import qualified Snap.Util.FileServe as Snap
12− , serveDirectoryWith
13− )
14−import Snap.Http.Server ( httpServe, setAccessLog, setErrorLog
15− , setPort, emptyConfig
16− )
17
13
18-- | Serve a given directory
14-- | Serve a given directory
19--
15--
20static :: FilePath -- ^ Directory to serve
16static :: FilePath -- ^ Directory to serve
21 -> (FilePath -> IO ()) -- ^ Pre-serve hook
17 -> (FilePath -> IO ()) -- ^ Pre-serve hook
22− -> Snap ()
18+ -> Snap.Snap ()
23static directory preServe =
19static directory preServe =
24− serveDirectoryWith directoryConfig directory
20+ Snap.serveDirectoryWith directoryConfig directory
25 where
21 where
26− directoryConfig :: DirectoryConfig Snap
22+ directoryConfig :: Snap.DirectoryConfig Snap.Snap
27− directoryConfig = fancyDirectoryConfig
23+ directoryConfig = Snap.fancyDirectoryConfig
28− { preServeHook = liftIO . preServe
24+ { Snap.preServeHook = liftIO . preServe
29 }
25 }
30
26
31-- | Main method, runs a static server in the given directory
27-- | Main method, runs a static server in the given directory
@@ -35,10 +31,10 @@ staticServer :: FilePath -- ^ Directory to serve
35 -> Int -- ^ Port to listen on
31 -> Int -- ^ Port to listen on
36 -> IO () -- ^ Blocks forever
32 -> IO () -- ^ Blocks forever
37staticServer directory preServe port =
33staticServer directory preServe port =
38− httpServe config $ static directory preServe
34+ Snap.httpServe config $ static directory preServe
39 where
35 where
40 -- Snap server config
36 -- Snap server config
41− config = setPort port
37+ config = Snap.setPort port
42− $ setAccessLog Nothing
38+ $ Snap.setAccessLog Snap.ConfigNoLog
43− $ setErrorLog Nothing
39+ $ Snap.setErrorLog Snap.ConfigNoLog
44− $ emptyConfig
40+ $ Snap.emptyConfig