diff --git a/hsfiles/mongo.hsfiles b/hsfiles/mongo.hsfiles --- a/hsfiles/mongo.hsfiles +++ b/hsfiles/mongo.hsfiles @@ -203,7 +203,7 @@ -- The page to be redirected to when authentication is required. authRoute _ = Just $ AuthR LoginR - -- Routes not requiring authenitcation. + -- Routes not requiring authentication. isAuthorized (AuthR _) _ = return Authorized isAuthorized FaviconR _ = return Authorized isAuthorized RobotsR _ = return Authorized diff --git a/hsfiles/mysql.hsfiles b/hsfiles/mysql.hsfiles --- a/hsfiles/mysql.hsfiles +++ b/hsfiles/mysql.hsfiles @@ -34,7 +34,6 @@ ) where import Import -import Settings import Yesod.Auth import Yesod.Default.Config import Yesod.Default.Main @@ -45,6 +44,7 @@ import qualified Network.Wai.Middleware.RequestLogger as RequestLogger import qualified Database.Persist import Database.Persist.Sql (runMigration) +import Database.Persist.MySQL (createMySQLPool, myConnInfo, myPoolSize) import Network.HTTP.Client.Conduit (newManager) import Control.Monad.Logger (runLoggingT) import System.Log.FastLogger (newStdoutLoggerSet, defaultBufSize) @@ -92,13 +92,12 @@ dbconf <- withYamlEnvironment "config/mysql.yml" (appEnv conf) Database.Persist.loadConfig >>= Database.Persist.applyEnv - p <- Database.Persist.createPoolConfig (dbconf :: Settings.PersistConf) loggerSet' <- newStdoutLoggerSet defaultBufSize (getter, _) <- clockDateCacher let logger = Yesod.Core.Types.Logger loggerSet' getter - foundation = App + mkFoundation p = App { settings = conf , getStatic = s , connPool = p @@ -106,11 +105,16 @@ , persistConfig = dbconf , appLogger = logger } + tempFoundation = mkFoundation $ error "connPool forced in tempFoundation" + logFunc = messageLoggerSource tempFoundation logger + p <- flip runLoggingT logFunc + $ createMySQLPool (myConnInfo dbconf) (myPoolSize dbconf) + let foundation = mkFoundation p + -- Perform database migration using our application's logging settings. - runLoggingT + flip runLoggingT logFunc (Database.Persist.runPool dbconf (runMigration migrateAll) p) - (messageLoggerSource foundation logger) return foundation @@ -210,7 +214,7 @@ -- The page to be redirected to when authentication is required. authRoute _ = Just $ AuthR LoginR - -- Routes not requiring authenitcation. + -- Routes not requiring authentication. isAuthorized (AuthR _) _ = return Authorized isAuthorized FaviconR _ = return Authorized isAuthorized RobotsR _ = return Authorized diff --git a/hsfiles/postgres-fay.hsfiles b/hsfiles/postgres-fay.hsfiles --- a/hsfiles/postgres-fay.hsfiles +++ b/hsfiles/postgres-fay.hsfiles @@ -35,7 +35,6 @@ ) where import Import -import Settings import Yesod.Auth import Yesod.Default.Config import Yesod.Default.Main @@ -46,6 +45,7 @@ import qualified Network.Wai.Middleware.RequestLogger as RequestLogger import qualified Database.Persist import Database.Persist.Sql (runMigration) +import Database.Persist.Postgresql (createPostgresqlPool, pgConnStr, pgPoolSize) import Network.HTTP.Client.Conduit (newManager) import Yesod.Fay (getFaySite) import Control.Monad.Logger (runLoggingT) @@ -95,13 +95,12 @@ dbconf <- withYamlEnvironment "config/postgresql.yml" (appEnv conf) Database.Persist.loadConfig >>= Database.Persist.applyEnv - p <- Database.Persist.createPoolConfig (dbconf :: Settings.PersistConf) loggerSet' <- newStdoutLoggerSet defaultBufSize (getter, _) <- clockDateCacher let logger = Yesod.Core.Types.Logger loggerSet' getter - foundation = App + mkFoundation p = App { settings = conf , getStatic = s , connPool = p @@ -110,11 +109,16 @@ , fayCommandHandler = onCommand , appLogger = logger } + tempFoundation = mkFoundation $ error "connPool forced in tempFoundation" + logFunc = messageLoggerSource tempFoundation logger + p <- flip runLoggingT logFunc + $ createPostgresqlPool (pgConnStr dbconf) (pgPoolSize dbconf) + let foundation = mkFoundation p + -- Perform database migration using our application's logging settings. - runLoggingT + flip runLoggingT logFunc (Database.Persist.runPool dbconf (runMigration migrateAll) p) - (messageLoggerSource foundation logger) return foundation @@ -215,7 +219,7 @@ -- The page to be redirected to when authentication is required. authRoute _ = Just $ AuthR LoginR - -- Routes not requiring authenitcation. + -- Routes not requiring authentication. isAuthorized (AuthR _) _ = return Authorized isAuthorized FaviconR _ = return Authorized isAuthorized RobotsR _ = return Authorized diff --git a/hsfiles/postgres.hsfiles b/hsfiles/postgres.hsfiles --- a/hsfiles/postgres.hsfiles +++ b/hsfiles/postgres.hsfiles @@ -34,7 +34,6 @@ ) where import Import -import Settings import Yesod.Auth import Yesod.Default.Config import Yesod.Default.Main @@ -45,6 +44,7 @@ import qualified Network.Wai.Middleware.RequestLogger as RequestLogger import qualified Database.Persist import Database.Persist.Sql (runMigration) +import Database.Persist.Postgresql (createPostgresqlPool, pgConnStr, pgPoolSize) import Network.HTTP.Client.Conduit (newManager) import Control.Monad.Logger (runLoggingT) import System.Log.FastLogger (newStdoutLoggerSet, defaultBufSize) @@ -92,13 +92,12 @@ dbconf <- withYamlEnvironment "config/postgresql.yml" (appEnv conf) Database.Persist.loadConfig >>= Database.Persist.applyEnv - p <- Database.Persist.createPoolConfig (dbconf :: Settings.PersistConf) loggerSet' <- newStdoutLoggerSet defaultBufSize (getter, _) <- clockDateCacher let logger = Yesod.Core.Types.Logger loggerSet' getter - foundation = App + mkFoundation p = App { settings = conf , getStatic = s , connPool = p @@ -106,11 +105,16 @@ , persistConfig = dbconf , appLogger = logger } + tempFoundation = mkFoundation $ error "connPool forced in tempFoundation" + logFunc = messageLoggerSource tempFoundation logger + p <- flip runLoggingT logFunc + $ createPostgresqlPool (pgConnStr dbconf) (pgPoolSize dbconf) + let foundation = mkFoundation p + -- Perform database migration using our application's logging settings. - runLoggingT + flip runLoggingT logFunc (Database.Persist.runPool dbconf (runMigration migrateAll) p) - (messageLoggerSource foundation logger) return foundation @@ -210,7 +214,7 @@ -- The page to be redirected to when authentication is required. authRoute _ = Just $ AuthR LoginR - -- Routes not requiring authenitcation. + -- Routes not requiring authentication. isAuthorized (AuthR _) _ = return Authorized isAuthorized FaviconR _ = return Authorized isAuthorized RobotsR _ = return Authorized diff --git a/hsfiles/sqlite.hsfiles b/hsfiles/sqlite.hsfiles --- a/hsfiles/sqlite.hsfiles +++ b/hsfiles/sqlite.hsfiles @@ -34,7 +34,6 @@ ) where import Import -import Settings import Yesod.Auth import Yesod.Default.Config import Yesod.Default.Main @@ -45,6 +44,7 @@ import qualified Network.Wai.Middleware.RequestLogger as RequestLogger import qualified Database.Persist import Database.Persist.Sql (runMigration) +import Database.Persist.Sqlite (createSqlitePool, sqlDatabase, sqlPoolSize) import Network.HTTP.Client.Conduit (newManager) import Control.Monad.Logger (runLoggingT) import System.Log.FastLogger (newStdoutLoggerSet, defaultBufSize) @@ -92,13 +92,12 @@ dbconf <- withYamlEnvironment "config/sqlite.yml" (appEnv conf) Database.Persist.loadConfig >>= Database.Persist.applyEnv - p <- Database.Persist.createPoolConfig (dbconf :: Settings.PersistConf) loggerSet' <- newStdoutLoggerSet defaultBufSize (getter, _) <- clockDateCacher let logger = Yesod.Core.Types.Logger loggerSet' getter - foundation = App + mkFoundation p = App { settings = conf , getStatic = s , connPool = p @@ -106,11 +105,16 @@ , persistConfig = dbconf , appLogger = logger } + tempFoundation = mkFoundation $ error "connPool forced in tempFoundation" + logFunc = messageLoggerSource tempFoundation logger + p <- flip runLoggingT logFunc + $ createSqlitePool (sqlDatabase dbconf) (sqlPoolSize dbconf) + let foundation = mkFoundation p + -- Perform database migration using our application's logging settings. - runLoggingT + flip runLoggingT logFunc (Database.Persist.runPool dbconf (runMigration migrateAll) p) - (messageLoggerSource foundation logger) return foundation @@ -210,7 +214,7 @@ -- The page to be redirected to when authentication is required. authRoute _ = Just $ AuthR LoginR - -- Routes not requiring authenitcation. + -- Routes not requiring authentication. isAuthorized (AuthR _) _ = return Authorized isAuthorized FaviconR _ = return Authorized isAuthorized RobotsR _ = return Authorized diff --git a/yesod-bin.cabal b/yesod-bin.cabal --- a/yesod-bin.cabal +++ b/yesod-bin.cabal @@ -1,5 +1,5 @@ name: yesod-bin -version: 1.4.0.2 +version: 1.4.0.3 license: MIT license-file: LICENSE author: Michael Snoyman