From c2da13eb3938ba86985218cd8ae6203087e950c1 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Thu, 25 Jun 2015 07:32:37 -0700 Subject: [PATCH] web: actually use the command line options (fixes #225) --- hledger-web/Application.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hledger-web/Application.hs b/hledger-web/Application.hs index 9a081369c..42c767770 100644 --- a/hledger-web/Application.hs +++ b/hledger-web/Application.hs @@ -53,7 +53,7 @@ mkYesodDispatch "App" resourcesApp -- migrations handled by Yesod. makeApplication :: WebOpts -> Journal -> AppConfig DefaultEnv Extra -> IO Application makeApplication opts j conf = do - foundation <- makeFoundation conf + foundation <- makeFoundation conf opts writeIORef (appJournal foundation) j app <- toWaiAppPlain foundation return $ logWare app @@ -62,8 +62,8 @@ makeApplication opts j conf = do | server_ opts = logStdout | otherwise = id -makeFoundation :: AppConfig DefaultEnv Extra -> IO App -makeFoundation conf = do +makeFoundation :: AppConfig DefaultEnv Extra -> WebOpts -> IO App +makeFoundation conf opts = do manager <- newManager #ifdef http_conduit_2 defaultManagerSettings @@ -72,7 +72,7 @@ makeFoundation conf = do #endif s <- staticSite jref <- newIORef nulljournal - return $ App conf s manager defwebopts jref + return $ App conf s manager opts jref -- for yesod devel -- uses the journal specified by the LEDGER_FILE env var, or ~/.hledger.journal