diff --git a/libatrade.cabal b/libatrade.cabal index 25a3d30..4b382a0 100644 --- a/libatrade.cabal +++ b/libatrade.cabal @@ -42,7 +42,6 @@ library , errors , extra , gitrev - , hslogger , http-client , http-client-tls , monad-loops @@ -81,7 +80,6 @@ test-suite libatrade-test , aeson , text , BoundedChan - , hslogger , zeromq4-haskell , zeromq4-haskell-zap , bytestring diff --git a/src/ATrade/Broker/Server.hs b/src/ATrade/Broker/Server.hs index 03f3e03..b9815fc 100644 --- a/src/ATrade/Broker/Server.hs +++ b/src/ATrade/Broker/Server.hs @@ -52,7 +52,6 @@ import qualified Data.Text as T import qualified Data.Text.Encoding as E import Data.Time.Clock () import Safe (lastMay) -import System.Log.Logger (debugM, warningM) import System.Timeout () import System.ZMQ4 (Context, Event (In), Poll (Sock), Pub (..), diff --git a/src/ATrade/Broker/TradeSinks/TelegramTradeSink.hs b/src/ATrade/Broker/TradeSinks/TelegramTradeSink.hs index 22d21ef..df829ce 100644 --- a/src/ATrade/Broker/TradeSinks/TelegramTradeSink.hs +++ b/src/ATrade/Broker/TradeSinks/TelegramTradeSink.hs @@ -18,7 +18,6 @@ import Data.IORef import qualified Data.List as L import Data.List.NonEmpty import Data.Maybe -import System.Log.Logger import ATrade.Broker.Protocol import ATrade.Types diff --git a/src/ATrade/Broker/TradeSinks/ZMQTradeSink.hs b/src/ATrade/Broker/TradeSinks/ZMQTradeSink.hs index 11a6946..2c0c94a 100644 --- a/src/ATrade/Broker/TradeSinks/ZMQTradeSink.hs +++ b/src/ATrade/Broker/TradeSinks/ZMQTradeSink.hs @@ -16,7 +16,6 @@ import qualified Data.ByteString as B hiding (putStrLn) import qualified Data.ByteString.Lazy as BL hiding (putStrLn) import Control.Monad.Loops import Control.Monad.Extra -import System.Log.Logger import System.Timeout import System.ZMQ4 @@ -32,9 +31,7 @@ withZMQTradeSink ctx tradeSinkEp f = do sinkThread ctx tradeSinkEp killMv chan = whileM_ (not <$> wasKilled) $ handle (\e -> do - warningM "Broker.Server" $ "Trade sink: exception: " ++ show (e :: SomeException) ++ "; isZMQ: " ++ show (isZMQError e) - when (isZMQError e) $ do - debugM "Broker.Server" "Rethrowing exception" + when (isZMQError (e :: SomeException)) $ do throwIO e) sinkThread' where sinkThread' = withSocket ctx Dealer (\sock -> do @@ -52,11 +49,11 @@ sinkThread ctx tradeSinkEp killMv chan = whileM_ (not <$> wasKilled) $ sendMulti sock $ B.empty :| [BL.toStrict $ encode TradeSinkHeartBeat] events <- poll 5000 [Sock sock [In] Nothing] if L.null . L.head $ events - then warningM "Broker.Server" "Trade sink timeout" + then return () else do void . receive $ sock -- anything will do sinkThread'' sock - + isZMQError e = "ZMQError" `L.isPrefixOf` show e wasKilled = isJust <$> tryReadMVar killMv diff --git a/src/ATrade/QuoteSource/Client.hs b/src/ATrade/QuoteSource/Client.hs index 0b46898..b117686 100644 --- a/src/ATrade/QuoteSource/Client.hs +++ b/src/ATrade/QuoteSource/Client.hs @@ -38,7 +38,6 @@ import qualified Data.Set as S import qualified Data.Text as T import Data.Text.Encoding (decodeUtf8, encodeUtf8) import Data.Time.Clock (diffUTCTime, getCurrentTime) -import System.Log.Logger (debugM) import System.ZMQ4 (Context, Event (In), Poll (Sock), Sub (Sub), connect, poll, receiveMulti, diff --git a/test/Spec.hs b/test/Spec.hs index 57a10a4..444f1b6 100644 --- a/test/Spec.hs +++ b/test/Spec.hs @@ -9,13 +9,8 @@ import qualified TestZMQTradeSink import Test.Tasty -import System.Log.Logger - main :: IO () -main = do - logger <- getRootLogger - updateGlobalLogger "" (setLevel EMERGENCY) - defaultMain $ testGroup "Tests" [properties, unitTests] +main = defaultMain $ testGroup "Tests" [properties, unitTests] properties :: TestTree properties = testGroup "Properties" [TestTypes.properties, TestBrokerProtocol.properties] diff --git a/test/TestBrokerServer.hs b/test/TestBrokerServer.hs index b0deef0..e2e07d5 100644 --- a/test/TestBrokerServer.hs +++ b/test/TestBrokerServer.hs @@ -28,7 +28,6 @@ import Data.UUID as U import Data.UUID.V4 as UV4 import Debug.Trace (traceM) import MockBroker -import System.Log.Logger import System.ZMQ4 unitTests :: TestTree