This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "snap-benchmarks".
The branch, master has been updated
via 2bef124f3aaf18707e9f2dcfefea8c75e27b55f0 (commit)
from fb7d87c5b5809b16563532636215bff45654a107 (commit)
Summary of changes:
snap-bench/snap-bench.cabal | 6 ++----
snap-bench/src/pong.hs | 12 ++++++------
snap-bench/src/table.hs | 6 +-----
3 files changed, 9 insertions(+), 15 deletions(-)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2bef124f3aaf18707e9f2dcfefea8c75e27b55f0
Author: Mighty Byte <[email protected]>
Date: Tue Oct 26 13:10:27 2010 -0400
Updates to the snap bench source.
diff --git a/snap-bench/snap-bench.cabal b/snap-bench/snap-bench.cabal
index 78ae7bc..b1e68e8 100644
--- a/snap-bench/snap-bench.cabal
+++ b/snap-bench/snap-bench.cabal
@@ -20,10 +20,9 @@ Executable pong-server
bytestring,
snap-core,
snap-server,
- heist,
filepath
- ghc-options: -O2 -Wall -fwarn-tabs -funbox-strict-fields -threaded
-fno-warn-unused-imports
+ ghc-options: -O2 -Wall -fwarn-tabs -funbox-strict-fields -threaded
-fno-warn-unused-imports -rtsopts
Extensions: OverloadedStrings
@@ -39,9 +38,8 @@ Executable table-server
bytestring,
snap-core,
snap-server,
- heist,
filepath
- ghc-options: -O2 -Wall -fwarn-tabs -funbox-strict-fields -threaded
-fno-warn-unused-imports
+ ghc-options: -O2 -Wall -fwarn-tabs -funbox-strict-fields -threaded
-fno-warn-unused-imports -rtsopts
Extensions: OverloadedStrings
diff --git a/snap-bench/src/pong.hs b/snap-bench/src/pong.hs
index 7fb74f9..f48f69c 100644
--- a/snap-bench/src/pong.hs
+++ b/snap-bench/src/pong.hs
@@ -7,10 +7,10 @@ import Snap.Http.Server
import Snap.Iteratee
import Snap.Types
import Snap.Util.FileServe
-import Text.Templating.Heist
site :: Snap ()
site = dir "pong" (writeBS "PONG") <|> fileServe "static"
+--site = writeBS "PONG"
pongServer :: Snap ()
pongServer = --dir "pong" $
@@ -22,9 +22,9 @@ main :: IO ()
main = do
args <- getArgs
let port = case args of
- [] -> 8000
+ [] -> 3000
p:_ -> read p
- httpServe "*" port "myserver"
- Nothing -- (Just "access.log")
- Nothing -- (Just "error.log")
- site
+ config = setPort port $
+ setAccessLog Nothing $
+ defaultConfig
+ httpServe config site
diff --git a/snap-bench/src/table.hs b/snap-bench/src/table.hs
index bad2c2f..44e2649 100644
--- a/snap-bench/src/table.hs
+++ b/snap-bench/src/table.hs
@@ -8,7 +8,6 @@ import Snap.Http.Server
import Snap.Iteratee
import Snap.Types
import Snap.Util.FileServe
-import Text.Templating.Heist
tableRow :: Int -> Snap ()
@@ -43,7 +42,4 @@ main = do
let port = case args of
[] -> 8000
p:_ -> read p
- httpServe "*" port "myserver"
- Nothing -- (Just "access.log")
- Nothing -- (Just "error.log")
- tableServer
+ httpServe (setPort port defaultConfig) tableServer
-----------------------------------------------------------------------
hooks/post-receive
--
snap-benchmarks
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
