fix compiler warnings

This commit is contained in:
Greg Weber 2011-07-12 22:12:43 -07:00
parent 7fd7ba59ca
commit a44d1d8ab0
3 changed files with 9 additions and 6 deletions

View File

@ -2,4 +2,8 @@
## Test suite ## Test suite
shelltest test/scaffold.shelltest shelltest tests/scaffold.shelltest
## Automated builder
tests/runscaffold.sh < sqlite-input.txt

View File

@ -2,7 +2,6 @@
module Handler.Root where module Handler.Root where
import ~sitearg~ import ~sitearg~
import Data.Text
-- This is a handler function for the GET request method on the RootR -- This is a handler function for the GET request method on the RootR
-- resource pattern. All of your resource patterns are defined in -- resource pattern. All of your resource patterns are defined in

View File

@ -3,7 +3,7 @@ import qualified Settings as Settings
import Settings (AppConfig(..)) import Settings (AppConfig(..))
import Controller (with~sitearg~) import Controller (with~sitearg~)
import Network.Wai.Handler.Warp (run) import Network.Wai.Handler.Warp (run)
import System.Console.CmdArgs import System.Console.CmdArgs hiding (args)
import Data.Char (toUpper, toLower) import Data.Char (toUpper, toLower)
#if PRODUCTION #if PRODUCTION
@ -15,13 +15,13 @@ import Network.Wai.Middleware.Debug (debug)
main :: IO () main :: IO ()
main = do main = do
args <- cmdArgs argConfig args <- cmdArgs argConfig
appEnv <- getAppEnv args env <- getAppEnv args
config <- Settings.loadConfig appEnv config <- Settings.loadConfig env
let c = if (port args) /= 0 then config {appPort = (port args) } else config let c = if (port args) /= 0 then config {appPort = (port args) } else config
#if PRODUCTION #if PRODUCTION
with~sitearg~ c $ run (appPort c) with~sitearg~ c $ run (appPort c)
#else #else
hPutStrLn stderr $ (show appEnv) ++ " application launched, listening on port " ++ show (appPort c) hPutStrLn stderr $ (show env) ++ " application launched, listening on port " ++ show (appPort c)
with~sitearg~ c $ run (appPort c) . debug with~sitearg~ c $ run (appPort c) . debug
#endif #endif