Report server and version in headers
This commit is contained in:
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
name: dbapi
|
name: dbapi
|
||||||
version: 0.2.4.0
|
version: 0.2.4.1
|
||||||
synopsis: The database is your api
|
synopsis: The database is your api
|
||||||
license: MIT
|
license: MIT
|
||||||
license-file: LICENSE
|
license-file: LICENSE
|
||||||
|
|||||||
+11
-2
@@ -1,6 +1,9 @@
|
|||||||
{-# LANGUAGE OverloadedStrings #-}
|
{-# LANGUAGE OverloadedStrings #-}
|
||||||
|
|
||||||
module Main where
|
module Main where
|
||||||
|
|
||||||
|
import Paths_dbapi (version)
|
||||||
|
|
||||||
import Dbapi
|
import Dbapi
|
||||||
import Middleware (inTransaction, authenticated, withSavepoint, clientErrors,
|
import Middleware (inTransaction, authenticated, withSavepoint, clientErrors,
|
||||||
redirectInsecure, withDBConnection)
|
redirectInsecure, withDBConnection)
|
||||||
@@ -15,8 +18,10 @@ import Network.Wai.Middleware.Gzip (gzip, def)
|
|||||||
import Network.Wai.Middleware.Cors (cors)
|
import Network.Wai.Middleware.Cors (cors)
|
||||||
import Network.Wai.Middleware.Static (staticPolicy, only)
|
import Network.Wai.Middleware.Static (staticPolicy, only)
|
||||||
import Database.HDBC (disconnect)
|
import Database.HDBC (disconnect)
|
||||||
import Database.HDBC.PostgreSQL(connectPostgreSQL')
|
import Database.HDBC.PostgreSQL (connectPostgreSQL')
|
||||||
import Data.Pool(createPool, destroyAllResources)
|
import Data.Pool(createPool, destroyAllResources)
|
||||||
|
import Data.List (intercalate)
|
||||||
|
import Data.Version (versionBranch)
|
||||||
|
|
||||||
argParser :: Parser AppConfig
|
argParser :: Parser AppConfig
|
||||||
argParser = AppConfig
|
argParser = AppConfig
|
||||||
@@ -45,7 +50,10 @@ main = do
|
|||||||
putStrLn "WARNING, running in insecure mode, auth will be in plaintext"
|
putStrLn "WARNING, running in insecure mode, auth will be in plaintext"
|
||||||
|
|
||||||
Prelude.putStrLn $ "Listening on port " ++ (show $ configPort conf :: String)
|
Prelude.putStrLn $ "Listening on port " ++ (show $ configPort conf :: String)
|
||||||
run port $ (if configSecure conf then redirectInsecure else id)
|
let settings = setPort port
|
||||||
|
. setServerName (cs $ "dbapi/" <> prettyVersion)
|
||||||
|
$ defaultSettings
|
||||||
|
runSettings settings $ (if configSecure conf then redirectInsecure else id)
|
||||||
. gzip def . cors corsPolicy . clientErrors
|
. gzip def . cors corsPolicy . clientErrors
|
||||||
. staticPolicy (only [("favicon.ico", "static/favicon.ico")])
|
. staticPolicy (only [("favicon.ico", "static/favicon.ico")])
|
||||||
. withDBConnection pool . inTransaction
|
. withDBConnection pool . inTransaction
|
||||||
@@ -53,3 +61,4 @@ main = do
|
|||||||
)
|
)
|
||||||
where
|
where
|
||||||
describe = progDesc "create a REST API to an existing Postgres database"
|
describe = progDesc "create a REST API to an existing Postgres database"
|
||||||
|
prettyVersion = intercalate "." $ map show $ versionBranch version
|
||||||
|
|||||||
Reference in New Issue
Block a user