@@ -61,6 +61,7 @@ executable postgrest
|
|||||||
, HTTP, http-types
|
, HTTP, http-types
|
||||||
, MissingH
|
, MissingH
|
||||||
, Ranged-sets
|
, Ranged-sets
|
||||||
|
, unix >= 2.7 && < 3
|
||||||
|
|
||||||
hs-source-dirs: src
|
hs-source-dirs: src
|
||||||
other-modules: Paths_postgrest
|
other-modules: Paths_postgrest
|
||||||
|
|||||||
+11
-1
@@ -10,7 +10,9 @@ import PostgREST.Error (pgErrResponse, PgError)
|
|||||||
import PostgREST.Middleware
|
import PostgREST.Middleware
|
||||||
import PostgREST.DbStructure
|
import PostgREST.DbStructure
|
||||||
|
|
||||||
import Control.Monad (unless)
|
import Control.Concurrent (myThreadId)
|
||||||
|
import Control.Exception.Base (throwTo, AsyncException(..))
|
||||||
|
import Control.Monad (unless, void)
|
||||||
import Control.Monad.IO.Class (liftIO)
|
import Control.Monad.IO.Class (liftIO)
|
||||||
import Data.Aeson (encode)
|
import Data.Aeson (encode)
|
||||||
import Data.Functor.Identity
|
import Data.Functor.Identity
|
||||||
@@ -26,6 +28,7 @@ import Network.Wai.Middleware.RequestLogger (logStdout)
|
|||||||
import System.IO (BufferMode (..),
|
import System.IO (BufferMode (..),
|
||||||
hSetBuffering, stderr,
|
hSetBuffering, stderr,
|
||||||
stdin, stdout)
|
stdin, stdout)
|
||||||
|
import System.Posix.Signals
|
||||||
import Web.JWT (secret)
|
import Web.JWT (secret)
|
||||||
|
|
||||||
isServerVersionSupported :: H.Session P.Postgres IO Bool
|
isServerVersionSupported :: H.Session P.Postgres IO Bool
|
||||||
@@ -69,6 +72,13 @@ main = do
|
|||||||
<> show minimumPgVersion)
|
<> show minimumPgVersion)
|
||||||
) supportedOrError
|
) supportedOrError
|
||||||
|
|
||||||
|
tid <- myThreadId
|
||||||
|
void $ installHandler keyboardSignal (Catch $ do
|
||||||
|
putStrLn "\nReleasing connection pool..."
|
||||||
|
H.releasePool pool
|
||||||
|
throwTo tid UserInterrupt
|
||||||
|
) Nothing
|
||||||
|
|
||||||
let txSettings = Just (H.ReadCommitted, Just True)
|
let txSettings = Just (H.ReadCommitted, Just True)
|
||||||
dbOrError <- H.session pool $ H.tx txSettings $ getDbStructure (cs $ configSchema conf)
|
dbOrError <- H.session pool $ H.tx txSettings $ getDbStructure (cs $ configSchema conf)
|
||||||
dbStructure <- either hasqlError return dbOrError
|
dbStructure <- either hasqlError return dbOrError
|
||||||
|
|||||||
Reference in New Issue
Block a user