aboutsummaryrefslogtreecommitdiff
path: root/client/src/Thermoprint/Client.hs
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/Thermoprint/Client.hs')
-rw-r--r--client/src/Thermoprint/Client.hs11
1 files changed, 6 insertions, 5 deletions
diff --git a/client/src/Thermoprint/Client.hs b/client/src/Thermoprint/Client.hs
index 8c4d99d..bb38268 100644
--- a/client/src/Thermoprint/Client.hs
+++ b/client/src/Thermoprint/Client.hs
@@ -17,7 +17,7 @@ module Thermoprint.Client
17 -- = Reexports 17 -- = Reexports
18 , ServantError(..) 18 , ServantError(..)
19 , module Thermoprint.API 19 , module Thermoprint.API
20 , module Servant.Common.BaseUrl 20 , module Servant.Client
21 , module Control.Monad.Except 21 , module Control.Monad.Except
22 , module Control.Natural 22 , module Control.Natural
23 ) where 23 ) where
@@ -27,10 +27,8 @@ import Data.Map (Map)
27import Data.Sequence (Seq) 27import Data.Sequence (Seq)
28import Data.Time (UTCTime) 28import Data.Time (UTCTime)
29 29
30import Servant.Client hiding (HasClient(..)) 30import Servant.Client hiding (HasClient(..), mkClient)
31import qualified Servant.Client as S 31import qualified Servant.Client as S
32import Servant.Common.BaseUrl
33import Servant.Common.Req
34import Network.HTTP.Client (Manager, ManagerSettings, newManager, defaultManagerSettings) 32import Network.HTTP.Client (Manager, ManagerSettings, newManager, defaultManagerSettings)
35import Servant.API 33import Servant.API
36-- import Servant.Utils.Enter 34-- import Servant.Utils.Enter
@@ -42,6 +40,8 @@ import Control.Monad.Catch (Exception, MonadThrow(..))
42import Control.Monad.IO.Class (MonadIO(..)) 40import Control.Monad.IO.Class (MonadIO(..))
43import Control.Monad.Trans (lift) 41import Control.Monad.Trans (lift)
44 42
43import Control.Concurrent.STM.TVar (newTVarIO)
44
45import Control.Monad 45import Control.Monad
46import Control.Category 46import Control.Category
47import Prelude hiding (id, (.)) 47import Prelude hiding (id, (.))
@@ -128,7 +128,8 @@ mkClient mSettings url = mkClientS clientNat
128 clientNat :: forall m. (MonadThrow m, MonadIO m) => ClientM :~> m 128 clientNat :: forall m. (MonadThrow m, MonadIO m) => ClientM :~> m
129 clientNat = NT $ \cAct -> do 129 clientNat = NT $ \cAct -> do
130 mgr <- liftIO $ newManager mSettings 130 mgr <- liftIO $ newManager mSettings
131 either throwM return =<< liftIO (runClientM cAct $ ClientEnv mgr url) 131 cjar <- liftIO $ newTVarIO mempty
132 either throwM return =<< liftIO (runClientM cAct . ClientEnv mgr url $ Just cjar)
132 133
133mkClient' :: (MonadThrow m, MonadIO m) => BaseUrl -> Client m 134mkClient' :: (MonadThrow m, MonadIO m) => BaseUrl -> Client m
134-- ^ @mkClient' = mkClient defaultManagerSettings 135-- ^ @mkClient' = mkClient defaultManagerSettings