From 3ca170b45d0ce43d540179d3fa2f833636772c9e Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sat, 28 Dec 2013 19:16:13 +0200 Subject: [PATCH] Scaffolding update #641 --- yesod-bin/hsfiles/mongo.hsfiles | 5 ++--- yesod-bin/hsfiles/mysql.hsfiles | 5 ++--- yesod-bin/hsfiles/postgres-fay.hsfiles | 5 ++--- yesod-bin/hsfiles/postgres.hsfiles | 5 ++--- yesod-bin/hsfiles/simple.hsfiles | 5 ++--- yesod-bin/hsfiles/sqlite.hsfiles | 5 ++--- yesod-bin/yesod-bin.cabal | 2 +- 7 files changed, 13 insertions(+), 19 deletions(-) diff --git a/yesod-bin/hsfiles/mongo.hsfiles b/yesod-bin/hsfiles/mongo.hsfiles index ef8463b4..2a152237 100644 --- a/yesod-bin/hsfiles/mongo.hsfiles +++ b/yesod-bin/hsfiles/mongo.hsfiles @@ -35,7 +35,6 @@ import Network.Wai.Middleware.RequestLogger import qualified Network.Wai.Middleware.RequestLogger as RequestLogger import qualified Database.Persist import Network.HTTP.Conduit (newManager, conduitManagerSettings) -import qualified GHC.IO.FD import System.Log.FastLogger (newLoggerSet, defaultBufSize) import Network.Wai.Logger (clockDateCacher) import Data.Default (def) @@ -82,7 +81,7 @@ makeFoundation conf = do Database.Persist.applyEnv p <- Database.Persist.createPoolConfig (dbconf :: Settings.PersistConf) - loggerSet' <- newLoggerSet defaultBufSize GHC.IO.FD.stdout + loggerSet' <- newLoggerSet defaultBufSize Nothing (getter, _) <- clockDateCacher let logger = Yesod.Core.Types.Logger loggerSet' getter @@ -414,7 +413,7 @@ library , aeson , conduit >= 1.0 , monad-logger >= 0.3 - , fast-logger >= 2.0 + , fast-logger >= 2.1 , wai-logger >= 2.0 executable PROJECTNAME diff --git a/yesod-bin/hsfiles/mysql.hsfiles b/yesod-bin/hsfiles/mysql.hsfiles index c24c6055..7fd31dd5 100644 --- a/yesod-bin/hsfiles/mysql.hsfiles +++ b/yesod-bin/hsfiles/mysql.hsfiles @@ -37,7 +37,6 @@ import qualified Database.Persist import Database.Persist.Sql (runMigration) import Network.HTTP.Conduit (newManager, conduitManagerSettings) import Control.Monad.Logger (runLoggingT) -import qualified GHC.IO.FD import System.Log.FastLogger (newLoggerSet, defaultBufSize) import Network.Wai.Logger (clockDateCacher) import Data.Default (def) @@ -84,7 +83,7 @@ makeFoundation conf = do Database.Persist.applyEnv p <- Database.Persist.createPoolConfig (dbconf :: Settings.PersistConf) - loggerSet' <- newLoggerSet defaultBufSize GHC.IO.FD.stdout + loggerSet' <- newLoggerSet defaultBufSize Nothing (getter, _) <- clockDateCacher let logger = Yesod.Core.Types.Logger loggerSet' getter @@ -418,7 +417,7 @@ library , aeson , conduit >= 1.0 , monad-logger >= 0.3 - , fast-logger >= 2.0 + , fast-logger >= 2.1 , wai-logger >= 2.0 executable PROJECTNAME diff --git a/yesod-bin/hsfiles/postgres-fay.hsfiles b/yesod-bin/hsfiles/postgres-fay.hsfiles index 543559b8..41255a3d 100644 --- a/yesod-bin/hsfiles/postgres-fay.hsfiles +++ b/yesod-bin/hsfiles/postgres-fay.hsfiles @@ -39,7 +39,6 @@ import Database.Persist.Sql (runMigration) import Network.HTTP.Conduit (newManager, conduitManagerSettings) import Yesod.Fay (getFaySite) import Control.Monad.Logger (runLoggingT) -import qualified GHC.IO.FD import System.Log.FastLogger (newLoggerSet, defaultBufSize) import Network.Wai.Logger (clockDateCacher) import Data.Default (def) @@ -87,7 +86,7 @@ makeFoundation conf = do Database.Persist.applyEnv p <- Database.Persist.createPoolConfig (dbconf :: Settings.PersistConf) - loggerSet' <- newLoggerSet defaultBufSize GHC.IO.FD.stdout + loggerSet' <- newLoggerSet defaultBufSize Nothing (getter, _) <- clockDateCacher let logger = Yesod.Core.Types.Logger loggerSet' getter @@ -455,7 +454,7 @@ library , aeson , conduit >= 1.0 , monad-logger >= 0.3 - , fast-logger >= 2.0 + , fast-logger >= 2.1 , wai-logger >= 2.0 executable PROJECTNAME diff --git a/yesod-bin/hsfiles/postgres.hsfiles b/yesod-bin/hsfiles/postgres.hsfiles index 32a9e2f5..e84152d6 100644 --- a/yesod-bin/hsfiles/postgres.hsfiles +++ b/yesod-bin/hsfiles/postgres.hsfiles @@ -37,7 +37,6 @@ import qualified Database.Persist import Database.Persist.Sql (runMigration) import Network.HTTP.Conduit (newManager, conduitManagerSettings) import Control.Monad.Logger (runLoggingT) -import qualified GHC.IO.FD import System.Log.FastLogger (newLoggerSet, defaultBufSize) import Network.Wai.Logger (clockDateCacher) import Data.Default (def) @@ -84,7 +83,7 @@ makeFoundation conf = do Database.Persist.applyEnv p <- Database.Persist.createPoolConfig (dbconf :: Settings.PersistConf) - loggerSet' <- newLoggerSet defaultBufSize GHC.IO.FD.stdout + loggerSet' <- newLoggerSet defaultBufSize Nothing (getter, _) <- clockDateCacher let logger = Yesod.Core.Types.Logger loggerSet' getter @@ -418,7 +417,7 @@ library , aeson , conduit >= 1.0 , monad-logger >= 0.3 - , fast-logger >= 2.0 + , fast-logger >= 2.1 , wai-logger >= 2.0 executable PROJECTNAME diff --git a/yesod-bin/hsfiles/simple.hsfiles b/yesod-bin/hsfiles/simple.hsfiles index 2617e814..f9ecb686 100644 --- a/yesod-bin/hsfiles/simple.hsfiles +++ b/yesod-bin/hsfiles/simple.hsfiles @@ -32,7 +32,6 @@ import Network.Wai.Middleware.RequestLogger ) import qualified Network.Wai.Middleware.RequestLogger as RequestLogger import Network.HTTP.Conduit (newManager, conduitManagerSettings) -import qualified GHC.IO.FD import System.Log.FastLogger (newLoggerSet, defaultBufSize) import Network.Wai.Logger (clockDateCacher) import Data.Default (def) @@ -75,7 +74,7 @@ makeFoundation conf = do manager <- newManager conduitManagerSettings s <- staticSite - loggerSet' <- newLoggerSet defaultBufSize GHC.IO.FD.stdout + loggerSet' <- newLoggerSet defaultBufSize Nothing (getter, _) <- clockDateCacher let logger = Yesod.Core.Types.Logger loggerSet' getter @@ -345,7 +344,7 @@ library , aeson , conduit >= 1.0 , monad-logger >= 0.3 - , fast-logger >= 2.0 + , fast-logger >= 2.1 , wai-logger >= 2.0 executable PROJECTNAME diff --git a/yesod-bin/hsfiles/sqlite.hsfiles b/yesod-bin/hsfiles/sqlite.hsfiles index 252dc12c..d837a53a 100644 --- a/yesod-bin/hsfiles/sqlite.hsfiles +++ b/yesod-bin/hsfiles/sqlite.hsfiles @@ -37,7 +37,6 @@ import qualified Database.Persist import Database.Persist.Sql (runMigration) import Network.HTTP.Conduit (newManager, conduitManagerSettings) import Control.Monad.Logger (runLoggingT) -import qualified GHC.IO.FD import System.Log.FastLogger (newLoggerSet, defaultBufSize) import Network.Wai.Logger (clockDateCacher) import Data.Default (def) @@ -84,7 +83,7 @@ makeFoundation conf = do Database.Persist.applyEnv p <- Database.Persist.createPoolConfig (dbconf :: Settings.PersistConf) - loggerSet' <- newLoggerSet defaultBufSize GHC.IO.FD.stdout + loggerSet' <- newLoggerSet defaultBufSize Nothing (getter, _) <- clockDateCacher let logger = Yesod.Core.Types.Logger loggerSet' getter @@ -418,7 +417,7 @@ library , aeson , conduit >= 1.0 , monad-logger >= 0.3 - , fast-logger >= 2.0 + , fast-logger >= 2.1 , wai-logger >= 2.0 executable PROJECTNAME diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal index ec581cff..d5196f4c 100644 --- a/yesod-bin/yesod-bin.cabal +++ b/yesod-bin/yesod-bin.cabal @@ -1,5 +1,5 @@ name: yesod-bin -version: 1.2.5.2 +version: 1.2.5.3 license: MIT license-file: LICENSE author: Michael Snoyman