More scaffolding fixes

yesod/scaffold/Application.hs.cg

@@ -11,9 +11,14 @@ import Yesod.Auth
 import Yesod.Default.Config
 import Yesod.Default.Main
 import Yesod.Default.Handlers
-import Yesod.Logger (Logger, logBS, flushLogger)
 import Data.Dynamic (Dynamic, toDyn)
-import Network.Wai.Middleware.RequestLogger (logHandleDev, logBS, logStdout)
+#if DEVELOPMENT
+import Yesod.Logger (Logger, logBS, flushLogger)
+import Network.Wai.Middleware.RequestLogger (logHandleDev)
+#else
+import Yesod.Logger (Logger)
+import Network.Wai.Middleware.RequestLogger (logStdout)
+#endif
 import qualified Database.Persist.Base~importMigration~
 
 -- Import all relevant handler modules here.
@@ -38,7 +43,7 @@ with~sitearg~ conf logger f = do
         defaultRunner (f . logWare) h
   where
 #ifdef DEVELOPMENT
-    logWare = logHandleDev (\msg -> logBS logger msg » flushLogger logger)
+    logWare = logHandleDev (\msg -> logBS logger msg >> flushLogger logger)
 #else
     logWare = logStdout
 #endif

yesod/scaffold/Foundation.hs.cg

@@ -23,7 +23,10 @@ import Yesod.Auth
 import Yesod.Auth.OpenId
 import Yesod.Default.Config
 import Yesod.Default.Util (addStaticContentExternal)
-import Yesod.Logger (Logger, logMsg, formatLogText, logLazyText)
+import Yesod.Logger (Logger, logMsg, formatLogText)
+#ifdef DEVELOPMENT
+import Yesod.Logger (logLazyText)
+#endif
 import qualified Settings
 import qualified Data.ByteString.Lazy as L
 import qualified Database.Persist.Base

yesod/scaffold/project.cabal.cg

@@ -93,3 +93,5 @@ executable         ~project~
                  , shakespeare-text              >= 0.10       && < 0.11
                  , hjsmin                        >= 0.0.14     && < 0.1
                  , monad-control                 ~monadControlVersion~
+                 , wai-extra                     >= 0.4.6      && < 0.5
+

yesod/scaffold/tiny/Application.hs.cg

@@ -5,7 +5,6 @@ module Application
     ) where
 
 import Import
-import Settings
 import Settings.StaticFiles (staticSite)
 import Yesod.Default.Config
 import Yesod.Default.Main (defaultDevelApp, defaultRunner)

yesod/scaffold/tiny/Foundation.hs.cg

@@ -18,7 +18,7 @@ import Yesod.Default.Config
 import Yesod.Default.Util (addStaticContentExternal)
 import Yesod.Static (Static, base64md5, StaticRoute(..))
 import Settings.StaticFiles
-import Yesod.Logger (Logger, logMsg, formatLogText, logLazyText)
+import Yesod.Logger (Logger, logMsg, formatLogText)
 import qualified Settings
 import Settings (widgetFile)
 import Control.Monad.Trans.Class (lift)