Commit 66196687 authored by Alfredo Di Napoli's avatar Alfredo Di Napoli

Do not log requests by default

parent b8d1de8c
...@@ -37,6 +37,7 @@ import qualified Data.Text.Lazy as TL ...@@ -37,6 +37,7 @@ import qualified Data.Text.Lazy as TL
import PUBMED.Types import PUBMED.Types
import PUBMED.ServantClientLogging import PUBMED.ServantClientLogging
import Control.Monad.Reader.Class (asks)
pmHost :: String pmHost :: String
pmHost = "eutils.ncbi.nlm.nih.gov" pmHost = "eutils.ncbi.nlm.nih.gov"
...@@ -45,11 +46,12 @@ pmSearchPath = "entrez/eutils" ...@@ -45,11 +46,12 @@ pmSearchPath = "entrez/eutils"
pmPort :: Int pmPort :: Int
pmPort = 443 pmPort = 443
defaultClientEnv :: IO ClientEnv defaultClientEnv :: Env ClientEnv
defaultClientEnv = do defaultClientEnv = do
manager' <- newManager tlsManagerSettings manager' <- liftIO $ newManager tlsManagerSettings
let env = mkClientEnv manager' $ BaseUrl Https pmHost pmPort pmSearchPath let env = mkClientEnv manager' $ BaseUrl Https pmHost pmPort pmSearchPath
pure $ addLoggingToClientEnv env enableDebugLogs <- asks enableDebugLogs
pure $ if enableDebugLogs then addLoggingToClientEnv env else env
-- | API main function -- | API main function
getMetadataWith :: Env (Either Text [PubMed]) getMetadataWith :: Env (Either Text [PubMed])
...@@ -58,8 +60,8 @@ getMetadataWith = runSimpleFindPubmedAbstractRequest Nothing ...@@ -58,8 +60,8 @@ getMetadataWith = runSimpleFindPubmedAbstractRequest Nothing
getMetadataWithC :: Env (Either ClientError (Maybe Integer, ConduitT () PubMed IO ())) getMetadataWithC :: Env (Either ClientError (Maybe Integer, ConduitT () PubMed IO ()))
getMetadataWithC = do getMetadataWithC = do
config@(Config { apiKey, query, perPage, mWebEnv }) <- ask config@(Config { apiKey, query, perPage, mWebEnv }) <- ask
liftIO $ do
env <- defaultClientEnv env <- defaultClientEnv
liftIO $ do
-- First, estimate the total number of documents -- First, estimate the total number of documents
eRes <- runClientM (searchWithHistory apiKey (Just query) Nothing (Just 1) (Just "y") mWebEnv) env eRes <- runClientM (searchWithHistory apiKey (Just query) Nothing (Just 1) (Just "y") mWebEnv) env
pure $ get' config env (fromMaybe defaultPerPage perPage) <$> eRes pure $ get' config env (fromMaybe defaultPerPage perPage) <$> eRes
...@@ -115,8 +117,8 @@ runSimpleFetchPubmedAbstractRequest :: [Integer] ...@@ -115,8 +117,8 @@ runSimpleFetchPubmedAbstractRequest :: [Integer]
-> Env (Either Text [PubMed]) -> Env (Either Text [PubMed])
runSimpleFetchPubmedAbstractRequest ids = do runSimpleFetchPubmedAbstractRequest ids = do
(Config { apiKey }) <- ask (Config { apiKey }) <- ask
liftIO $ do
env <- defaultClientEnv env <- defaultClientEnv
liftIO $ do
res <- runClientM res <- runClientM
(fetch apiKey (Just "pubmed") (Just "abstract") ids) (fetch apiKey (Just "pubmed") (Just "abstract") ids)
env env
...@@ -147,8 +149,8 @@ runSimpleFindPubmedAbstractRequest offset = do ...@@ -147,8 +149,8 @@ runSimpleFindPubmedAbstractRequest offset = do
searchDocIds :: Maybe Offset -> Env (Either Text [Integer]) searchDocIds :: Maybe Offset -> Env (Either Text [Integer])
searchDocIds offset = do searchDocIds offset = do
(Config { apiKey, query, perPage, mWebEnv }) <- ask (Config { apiKey, query, perPage, mWebEnv }) <- ask
res <- liftIO $ do
env <- defaultClientEnv env <- defaultClientEnv
res <- liftIO $ do
runClientM runClientM
(searchWithHistory apiKey (Just query) offset perPage (Just "y") mWebEnv) (searchWithHistory apiKey (Just query) offset perPage (Just "y") mWebEnv)
env env
......
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