Browse Source

Get rid of hslogger

master
Denis Tereshkin 4 years ago
parent
commit
9f607cde6a
  1. 2
      libatrade.cabal
  2. 1
      src/ATrade/Broker/Server.hs
  3. 1
      src/ATrade/Broker/TradeSinks/TelegramTradeSink.hs
  4. 7
      src/ATrade/Broker/TradeSinks/ZMQTradeSink.hs
  5. 1
      src/ATrade/QuoteSource/Client.hs
  6. 7
      test/Spec.hs
  7. 1
      test/TestBrokerServer.hs

2
libatrade.cabal

@ -42,7 +42,6 @@ library
, errors , errors
, extra , extra
, gitrev , gitrev
, hslogger
, http-client , http-client
, http-client-tls , http-client-tls
, monad-loops , monad-loops
@ -81,7 +80,6 @@ test-suite libatrade-test
, aeson , aeson
, text , text
, BoundedChan , BoundedChan
, hslogger
, zeromq4-haskell , zeromq4-haskell
, zeromq4-haskell-zap , zeromq4-haskell-zap
, bytestring , bytestring

1
src/ATrade/Broker/Server.hs

@ -52,7 +52,6 @@ import qualified Data.Text as T
import qualified Data.Text.Encoding as E import qualified Data.Text.Encoding as E
import Data.Time.Clock () import Data.Time.Clock ()
import Safe (lastMay) import Safe (lastMay)
import System.Log.Logger (debugM, warningM)
import System.Timeout () import System.Timeout ()
import System.ZMQ4 (Context, Event (In), import System.ZMQ4 (Context, Event (In),
Poll (Sock), Pub (..), Poll (Sock), Pub (..),

1
src/ATrade/Broker/TradeSinks/TelegramTradeSink.hs

@ -18,7 +18,6 @@ import Data.IORef
import qualified Data.List as L import qualified Data.List as L
import Data.List.NonEmpty import Data.List.NonEmpty
import Data.Maybe import Data.Maybe
import System.Log.Logger
import ATrade.Broker.Protocol import ATrade.Broker.Protocol
import ATrade.Types import ATrade.Types

7
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 qualified Data.ByteString.Lazy as BL hiding (putStrLn)
import Control.Monad.Loops import Control.Monad.Loops
import Control.Monad.Extra import Control.Monad.Extra
import System.Log.Logger
import System.Timeout import System.Timeout
import System.ZMQ4 import System.ZMQ4
@ -32,9 +31,7 @@ withZMQTradeSink ctx tradeSinkEp f = do
sinkThread ctx tradeSinkEp killMv chan = whileM_ (not <$> wasKilled) $ sinkThread ctx tradeSinkEp killMv chan = whileM_ (not <$> wasKilled) $
handle (\e -> do handle (\e -> do
warningM "Broker.Server" $ "Trade sink: exception: " ++ show (e :: SomeException) ++ "; isZMQ: " ++ show (isZMQError e) when (isZMQError (e :: SomeException)) $ do
when (isZMQError e) $ do
debugM "Broker.Server" "Rethrowing exception"
throwIO e) sinkThread' throwIO e) sinkThread'
where where
sinkThread' = withSocket ctx Dealer (\sock -> do sinkThread' = withSocket ctx Dealer (\sock -> do
@ -52,7 +49,7 @@ sinkThread ctx tradeSinkEp killMv chan = whileM_ (not <$> wasKilled) $
sendMulti sock $ B.empty :| [BL.toStrict $ encode TradeSinkHeartBeat] sendMulti sock $ B.empty :| [BL.toStrict $ encode TradeSinkHeartBeat]
events <- poll 5000 [Sock sock [In] Nothing] events <- poll 5000 [Sock sock [In] Nothing]
if L.null . L.head $ events if L.null . L.head $ events
then warningM "Broker.Server" "Trade sink timeout" then return ()
else do else do
void . receive $ sock -- anything will do void . receive $ sock -- anything will do
sinkThread'' sock sinkThread'' sock

1
src/ATrade/QuoteSource/Client.hs

@ -38,7 +38,6 @@ import qualified Data.Set as S
import qualified Data.Text as T import qualified Data.Text as T
import Data.Text.Encoding (decodeUtf8, encodeUtf8) import Data.Text.Encoding (decodeUtf8, encodeUtf8)
import Data.Time.Clock (diffUTCTime, getCurrentTime) import Data.Time.Clock (diffUTCTime, getCurrentTime)
import System.Log.Logger (debugM)
import System.ZMQ4 (Context, Event (In), import System.ZMQ4 (Context, Event (In),
Poll (Sock), Sub (Sub), Poll (Sock), Sub (Sub),
connect, poll, receiveMulti, connect, poll, receiveMulti,

7
test/Spec.hs

@ -9,13 +9,8 @@ import qualified TestZMQTradeSink
import Test.Tasty import Test.Tasty
import System.Log.Logger
main :: IO () main :: IO ()
main = do main = defaultMain $ testGroup "Tests" [properties, unitTests]
logger <- getRootLogger
updateGlobalLogger "" (setLevel EMERGENCY)
defaultMain $ testGroup "Tests" [properties, unitTests]
properties :: TestTree properties :: TestTree
properties = testGroup "Properties" [TestTypes.properties, TestBrokerProtocol.properties] properties = testGroup "Properties" [TestTypes.properties, TestBrokerProtocol.properties]

1
test/TestBrokerServer.hs

@ -28,7 +28,6 @@ import Data.UUID as U
import Data.UUID.V4 as UV4 import Data.UUID.V4 as UV4
import Debug.Trace (traceM) import Debug.Trace (traceM)
import MockBroker import MockBroker
import System.Log.Logger
import System.ZMQ4 import System.ZMQ4
unitTests :: TestTree unitTests :: TestTree

Loading…
Cancel
Save