Merge pull request #60 from stevely/master

Updated code for Snap framework

installer.py

@@ -236,6 +236,12 @@ class Installer:
     self.__run_command("cabal update")
     self.__run_command("cabal install yesod persistent-mysql")
 
+    ##############################
+    # Snap
+    ##############################
+    self.__run_command("cabal update")
+    self.__run_commnad("cabal install HDBC HDBC-mysql MonadCatchIO-transformers configurator json snap-core snap-server resource-pool")
+
     ##############################################################
     #
     # System Tools

snap/bench/snap-bench.cabal

@@ -9,8 +9,6 @@ Stability:           Experimental
 Category:            Web
 Build-type:          Simple
 Cabal-version:       >=1.2
-data-dir:            cfg
-data-files:          db.cfg
 
 Executable snap-bench
   hs-source-dirs: src

snap/bench/src/Main.hs

@@ -9,7 +9,6 @@ import Database.HDBC.MySQL
 import Data.Configurator
 import Data.Int
 import Data.Pool
-import Paths_snap_bench
 import Prelude hiding (lookup)
 import qualified Data.ByteString.Char8 as B
 import Snap.Core
@@ -19,8 +18,7 @@ import Text.JSON
 
 main :: IO ()
 main = do
-    fp <- getDataFileName "db.cfg"
-    db <- load [Required fp]
+    db <- load [Required "cfg/db.cfg"]
     foos <- mapM (lookup db) ["host", "uname", "pword", "dbase", "dport"]
     let foos' = sequence foos
     maybe (putStrLn "No foo") dbSetup foos'

snap/setup.py

@@ -5,11 +5,11 @@ import os
 
 def start(args):
   setup_util.replace_text("snap/bench/cfg/db.cfg", "host=\".*\"", "host=\"" + args.database_host + "\"")
-  subprocess.check_call("cabal install HDBC HDBC-mysql MonadCatchIO-transformers configurator json snap-core snap-server resource-pool", shell=True)  
   subprocess.check_call("cabal configure", shell=True, cwd="snap/bench")
-  subprocess.check_call("cabal install", shell=True, cwd="snap/bench")
+  subprocess.check_call("cabal build", shell=True, cwd="snap/bench")
 
-  subprocess.Popen("dist/build/snap-bench/snap-bench +RTS -N" + str(args.max_threads) + " > /dev/null", shell=True, cwd="snap/bench")
+  t = str(args.max_threads)
+  subprocess.Popen("dist/build/snap-bench/snap-bench +RTS -A" + t + "M -N" + t + " > /dev/null", shell=True, cwd="snap/bench")
   return 0
 
 def stop():