Start9/registry
2
0
Fork 0
mirror of https://github.com/Start9Labs/registry.git synced 2026-04-01 20:44:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle proper version info parsing

Browse Source
This commit is contained in:
Lucy Cifferello
2020-06-08 15:18:57 -06:00
parent 2fb72aeca4
commit 87a6b9bb9b
8 changed files with 102 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Application.hs
View File

@@ -31,7 +31,7 @@ import Control.Monad.Logger (liftLoc, runLoggingT)
import Data.Aeson
import Data.Default
import Data.IORef
import Database.Persist.Postgresql (createPostgresqlPool, pgConnStr, pgPoolSize)
import Database.Persist.Postgresql (createPostgresqlPool, pgConnStr, pgPoolSize, runSqlPool, runMigration)
import Language.Haskell.TH.Syntax (qLocation)
import Network.Wai
import Network.Wai.Handler.Warp (Settings, defaultSettings, defaultShouldDisplayException,
@@ -56,6 +56,7 @@ import Handler.Icons
import Handler.Version
import Lib.Ssl
import Settings
import Model
import System.Posix.Process
-- This line actually creates our YesodDispatch instance. It is the second half
@@ -96,6 +97,9 @@ makeFoundation appSettings = do
(pgConnStr $ appDatabaseConf appSettings)
(pgPoolSize . appDatabaseConf $ appSettings)
-- Preform database migration using application logging settings
runLoggingT (runSqlPool (runMigration migrateAll) pool) logFunc
-- Return the foundation
return $ mkFoundation pool