jimmy/postgrest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Remove Protolude.Conv from Workers

Browse Source
This commit is contained in:
monacoremo
2021-11-12 20:25:22 +01:00
committed by Remo
parent 65062364c4
commit 8cc8531e49
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PostgREST/Workers.hs
+9 -8
View File
@@ -9,6 +9,8 @@ module PostgREST.Workers
import qualified Data.Aeson as JSON import qualified Data.Aeson as JSON
import qualified Data.ByteString as BS import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as LBS
import qualified Data.Text.Encoding as T
import qualified Hasql.Notifications as SQL import qualified Hasql.Notifications as SQL
import qualified Hasql.Pool as SQL import qualified Hasql.Pool as SQL
import qualified Hasql.Transaction.Sessions as SQL import qualified Hasql.Transaction.Sessions as SQL
@@ -27,8 +29,7 @@ import PostgREST.Error (PgError (PgError), checkIsFatal,
import qualified PostgREST.AppState as AppState import qualified PostgREST.AppState as AppState
import Protolude hiding (head, toS) import Protolude
import Protolude.Conv (toS)
-- | Current database connection status data ConnectionStatus -- | Current database connection status data ConnectionStatus
@@ -121,7 +122,7 @@ connectionStatus appState =
case pgVersion of case pgVersion of
Left e -> do Left e -> do
let err = PgError False e let err = PgError False e
AppState.logWithZTime appState . toS $ errorPayload err AppState.logWithZTime appState . T.decodeUtf8 . LBS.toStrict $ errorPayload err
case checkIsFatal err of case checkIsFatal err of
Just reason -> Just reason ->
return $ FatalConnectionError reason return $ FatalConnectionError reason
@@ -159,7 +160,7 @@ loadSchemaCache appState = do
Left e -> do Left e -> do
let let
err = PgError False e err = PgError False e
putErr = AppState.logWithZTime appState . toS $ errorPayload err putErr = AppState.logWithZTime appState . T.decodeUtf8 . LBS.toStrict $ errorPayload err
case checkIsFatal err of case checkIsFatal err of
Just hint -> do Just hint -> do
AppState.logWithZTime appState "A fatal error ocurred when loading the schema cache" AppState.logWithZTime appState "A fatal error ocurred when loading the schema cache"
@@ -173,8 +174,8 @@ loadSchemaCache appState = do
Right dbStructure -> do Right dbStructure -> do
AppState.putDbStructure appState dbStructure AppState.putDbStructure appState dbStructure
when (isJust configDbRootSpec) $ when (isJust configDbRootSpec) .
AppState.putJsonDbS appState $ toS $ JSON.encode dbStructure AppState.putJsonDbS appState . LBS.toStrict $ JSON.encode dbStructure
AppState.logWithZTime appState "Schema cache loaded" AppState.logWithZTime appState "Schema cache loaded"
return SCLoaded return SCLoaded
@@ -194,7 +195,7 @@ listener appState = do
-- forkFinally allows to detect if the thread dies -- forkFinally allows to detect if the thread dies
void . flip forkFinally (handleFinally dbChannel) $ do void . flip forkFinally (handleFinally dbChannel) $ do
dbOrError <- acquire $ toS configDbUri dbOrError <- acquire $ toUtf8 configDbUri
case dbOrError of case dbOrError of
Right db -> do Right db -> do
AppState.logWithZTime appState $ "Listening for notifications on the " <> dbChannel <> " channel" AppState.logWithZTime appState $ "Listening for notifications on the " <> dbChannel <> " channel"
@@ -234,7 +235,7 @@ reReadConfig startingUp appState = do
Left e -> do Left e -> do
let let
err = PgError False e err = PgError False e
putErr = AppState.logWithZTime appState . toS $ errorPayload err putErr = AppState.logWithZTime appState . T.decodeUtf8 . LBS.toStrict $ errorPayload err
AppState.logWithZTime appState AppState.logWithZTime appState
"An error ocurred when trying to query database settings for the config parameters" "An error ocurred when trying to query database settings for the config parameters"
case checkIsFatal err of case checkIsFatal err of