Commit 72ba377f authored by Alexandre Delanoë's avatar Alexandre Delanoë

[DEBUG] if SQL query fails then print Query in logs.

parent 9179315e
Pipeline #303 failed with stage
...@@ -35,6 +35,7 @@ module Gargantext.API.Ngrams ...@@ -35,6 +35,7 @@ module Gargantext.API.Ngrams
where where
-- import Debug.Trace (trace) -- import Debug.Trace (trace)
import Control.Exception (Exception)
import Prelude (Enum, Bounded, Semigroup(..), minBound, maxBound {-, round-}, error) import Prelude (Enum, Bounded, Semigroup(..), minBound, maxBound {-, round-}, error)
-- import Gargantext.Database.Schema.User (UserId) -- import Gargantext.Database.Schema.User (UserId)
import Data.Functor (($>)) import Data.Functor (($>))
...@@ -893,7 +894,7 @@ type MaxSize = Int ...@@ -893,7 +894,7 @@ type MaxSize = Int
-- TODO: polymorphic for Annuaire or Corpus or ... -- TODO: polymorphic for Annuaire or Corpus or ...
-- | Table of Ngrams is a ListNgrams formatted (sorted and/or cut). -- | Table of Ngrams is a ListNgrams formatted (sorted and/or cut).
-- TODO: should take only one ListId -- TODO: should take only one ListId
getTableNgrams :: (RepoCmdM env err m, HasNodeError err, HasConnection env) getTableNgrams :: (RepoCmdM env err m, HasNodeError err, HasConnection env, Exception err)
=> CorpusId -> TabType => CorpusId -> TabType
-> ListId -> Limit -> Maybe Offset -> ListId -> Limit -> Maybe Offset
-> Maybe ListType -> Maybe ListType
......
...@@ -15,6 +15,7 @@ Node API ...@@ -15,6 +15,7 @@ Node API
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE MonoLocalBinds #-}
{-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE RankNTypes #-} {-# LANGUAGE RankNTypes #-}
......
...@@ -8,22 +8,24 @@ Stability : experimental ...@@ -8,22 +8,24 @@ Stability : experimental
Portability : POSIX Portability : POSIX
-} -}
{-# OPTIONS_GHC -fno-warn-orphans #-}
{-# OPTIONS_GHC -fno-warn-name-shadowing #-} {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
{-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE MonoLocalBinds #-}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE RankNTypes #-}
{-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TemplateHaskell #-}
module Gargantext.API.Settings module Gargantext.API.Settings
where where
import Control.Exception (Exception)
import System.Directory import System.Directory
import System.Log.FastLogger import System.Log.FastLogger
import GHC.Enum import GHC.Enum
...@@ -274,7 +276,7 @@ withDevEnv k = do ...@@ -274,7 +276,7 @@ withDevEnv k = do
k env `finally` unlockFile (env ^. repoEnv . renv_lock) k env `finally` unlockFile (env ^. repoEnv . renv_lock)
-- | Run Cmd Sugar for the Repl (GHCI) -- | Run Cmd Sugar for the Repl (GHCI)
runCmdRepl :: Show err => Cmd' DevEnv err a -> IO a runCmdRepl :: (Show err, Exception err) => Cmd' DevEnv err a -> IO a
runCmdRepl f = withDevEnv $ \env -> runCmdDev env f runCmdRepl f = withDevEnv $ \env -> runCmdDev env f
runCmdReplServantErr :: Cmd' DevEnv ServantErr a -> IO a runCmdReplServantErr :: Cmd' DevEnv ServantErr a -> IO a
...@@ -288,12 +290,14 @@ newDevEnv = newDevEnvWith "gargantext.ini" ...@@ -288,12 +290,14 @@ newDevEnv = newDevEnvWith "gargantext.ini"
-- the command. -- the command.
-- This function is constrained to the DevEnv rather than -- This function is constrained to the DevEnv rather than
-- using HasConnection and HasRepoVar. -- using HasConnection and HasRepoVar.
runCmdDev :: Show err => DevEnv -> Cmd' DevEnv err a -> IO a runCmdDev :: (Show err, Exception err) => DevEnv -> Cmd' DevEnv err a -> IO a
runCmdDev env f = runCmdDev env f =
(either (fail . show) pure =<< runCmd env f) (either (fail . show) pure =<< runCmd env f)
`finally` `finally`
runReaderT saveRepo env runReaderT saveRepo env
instance Exception ()
-- Use only for dev -- Use only for dev
runCmdDevNoErr :: DevEnv -> Cmd' DevEnv () a -> IO a runCmdDevNoErr :: DevEnv -> Cmd' DevEnv () a -> IO a
runCmdDevNoErr = runCmdDev runCmdDevNoErr = runCmdDev
......
...@@ -20,6 +20,7 @@ Portability : POSIX ...@@ -20,6 +20,7 @@ Portability : POSIX
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE RankNTypes #-} {-# LANGUAGE RankNTypes #-}
{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE MonoLocalBinds #-}
module Gargantext.Database.Flow -- (flowDatabase, ngrams2list) module Gargantext.Database.Flow -- (flowDatabase, ngrams2list)
where where
......
...@@ -11,9 +11,9 @@ Node API ...@@ -11,9 +11,9 @@ Node API
-} -}
{-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE MonoLocalBinds #-}
module Gargantext.Database.Metrics module Gargantext.Database.Metrics
where where
......
...@@ -20,8 +20,9 @@ commentary with @some markup@. ...@@ -20,8 +20,9 @@ commentary with @some markup@.
module Gargantext.Database.Utils where module Gargantext.Database.Utils where
import Control.Exception import Data.ByteString.Char8 (hPutStrLn)
import Data.Text (Text) import System.IO (stderr)
import Control.Exception
import Control.Monad.Error.Class -- (MonadError(..), Error) import Control.Monad.Error.Class -- (MonadError(..), Error)
import Control.Lens (Getter, view) import Control.Lens (Getter, view)
import Control.Monad.Reader import Control.Monad.Reader
...@@ -55,11 +56,13 @@ type CmdM' env err m = ...@@ -55,11 +56,13 @@ type CmdM' env err m =
( MonadReader env m ( MonadReader env m
, MonadError err m , MonadError err m
, MonadIO m , MonadIO m
, Exception err
) )
type CmdM env err m = type CmdM env err m =
( CmdM' env err m ( CmdM' env err m
, HasConnection env , HasConnection env
, Exception err
) )
type Cmd' env err a = forall m. CmdM' env err m => m a type Cmd' env err a = forall m. CmdM' env err m => m a
...@@ -72,7 +75,7 @@ mkCmd k = do ...@@ -72,7 +75,7 @@ mkCmd k = do
conn <- view connection conn <- view connection
liftIO $ k conn liftIO $ k conn
runCmd :: HasConnection env => env runCmd :: (HasConnection env, Exception err) => env
-> Cmd' env err a -> Cmd' env err a
-> IO (Either err a) -> IO (Either err a)
runCmd env m = runExceptT $ runReaderT m env runCmd env m = runExceptT $ runReaderT m env
...@@ -83,25 +86,19 @@ runOpaQuery q = mkCmd $ \c -> runQuery c q ...@@ -83,25 +86,19 @@ runOpaQuery q = mkCmd $ \c -> runQuery c q
formatPGSQuery :: PGS.ToRow a => PGS.Query -> a -> Cmd err DB.ByteString formatPGSQuery :: PGS.ToRow a => PGS.Query -> a -> Cmd err DB.ByteString
formatPGSQuery q a = mkCmd $ \conn -> PGS.formatQuery conn q a formatPGSQuery q a = mkCmd $ \conn -> PGS.formatQuery conn q a
runPGSQuery :: (PGS.ToRow a, PGS.FromRow b) => PGS.Query -> a -> Cmd err [b] -- TODO use runPGSQueryDebug everywhere
runPGSQuery q a = mkCmd $ \conn -> PGS.query conn q a runPGSQuery' :: (PGS.ToRow a, PGS.FromRow b) => PGS.Query -> a -> Cmd err [b]
runPGSQuery' q a = mkCmd $ \conn -> PGS.query conn q a
runPGSQuery :: (MonadError err m, MonadReader env m,
data SqlErrorX = SqlErrorX PGS.FromRow r, PGS.ToRow q, MonadIO m, HasConnection env, Exception err)
deriving (Eq, Show)
instance Exception SqlErrorX
runPGSQuery' :: (MonadError (SqlErrorX) m, MonadReader env m,
PGS.FromRow r, PGS.ToRow q, MonadIO m, HasConnection env)
=> PGS.Query -> q -> m [r] => PGS.Query -> q -> m [r]
runPGSQuery' q a = mkCmd $ \conn -> catchError (PGS.query conn q a) (printError conn) runPGSQuery q a = mkCmd $ \conn -> catch (PGS.query conn q a) (printError conn)
where where
printError c e = do printError c (SomeException e) = do
q' <- (PGS.formatQuery c q a :: IO DB.ByteString) q' <- (PGS.formatQuery c q a :: IO DB.ByteString)
putStrLn (cs q':: Text) hPutStrLn stderr q'
throwError e throw e
execPGSQuery :: PGS.ToRow a => PGS.Query -> a -> Cmd err Int64 execPGSQuery :: PGS.ToRow a => PGS.Query -> a -> Cmd err Int64
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment