From e7f97c1cf2e3df465e56a0541efe6471e0445c7c Mon Sep 17 00:00:00 2001
From: Denis Tereshkin <denis@kasan.ws>
Date: Sat, 1 Jul 2017 23:41:38 +0700
Subject: [PATCH] Debug++

---
 app/Main.hs               | 15 ++++++++++-----
 src/Broker/PaperBroker.hs |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/Main.hs b/app/Main.hs
index 8c0741b..ada2eac 100644
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -26,6 +26,7 @@ import Broker.PaperBroker
 import Broker.QuikBroker
 
 import System.Directory
+import System.Timeout
 import System.Log.Logger
 import System.Log.Handler.Simple
 import System.Log.Handler (setFormatter)
@@ -165,7 +166,7 @@ main = do
   case eitherBrokerQ of
     Left errmsg -> warningM "main" $ "Can't load quik broker: " ++ T.unpack errmsg
     Right brokerQ ->
-      withContext (\ctx ->
+      withContext (\ctx -> do
         withZapHandler ctx (\zap -> do
           zapSetWhitelist zap $ whitelist config
           zapSetBlacklist zap $ blacklist config
@@ -188,8 +189,8 @@ main = do
           let serverParams = defaultServerSecurityParams { sspDomain = Just "global",
             sspCertificate = serverCert }
 
-          withZMQTradeSink ctx (tradeSink config) (\zmqTradeSink ->
-            withTelegramTradeSink (telegramToken config) (telegramChatId config) (\telegramTradeSink ->
+          withZMQTradeSink ctx (tradeSink config) (\zmqTradeSink -> do
+            withTelegramTradeSink (telegramToken config) (telegramChatId config) (\telegramTradeSink -> do
               bracket (startQuoteSourceServer c2 ctx (T.pack $ quotesourceEndpoint config)) stopQuoteSourceServer (\qsServer -> do
                 bracket (startBrokerServer [broker, brokerQ] ctx (T.pack $ brokerserverEndpoint config) [telegramTradeSink, zmqTradeSink] serverParams) stopBrokerServer (\broServer -> do
                   Gtk.init Nothing
@@ -197,8 +198,12 @@ main = do
                   on window #destroy Gtk.mainQuit
                   #showAll window
                   Gtk.main)
-                infoM "main" "BRS down")))))
-  killThread forkId
+                infoM "main" "BRS down")
+              debugM "main" "QS done")
+            debugM "main" "TGTS done")
+          debugM "main" "ZMQTS done")
+        debugM "main" "ZAP done")
+  timeout 1000000 $ killThread forkId
   infoM "main" "Main thread done"
 
 loadCertificatesFromDirectory path = do
diff --git a/src/Broker/PaperBroker.hs b/src/Broker/PaperBroker.hs
index 27e287e..0e415a4 100644
--- a/src/Broker/PaperBroker.hs
+++ b/src/Broker/PaperBroker.hs
@@ -141,7 +141,7 @@ executeAtTick state order tick = do
   let newOrder = order { orderState = Executed }
   let tradeVolume = realFracToDecimal 10 (fromIntegral $ orderQuantity order) * value tick
   atomicModifyIORef' state (\s -> (s { orders = M.insert (orderId order) newOrder $ orders s , cash = cash s - tradeVolume}, ()))
-  debugM "PaperBroker" $ "Executed: " ++ show newOrder
+  debugM "PaperBroker" $ "Executed: " ++ show newOrder ++ "; at tick: " ++ show tick
   ts <- getCurrentTime
   maybeCall notificationCallback state $ TradeNotification $ mkTrade tick order ts
   maybeCall notificationCallback state $ OrderNotification (orderId order) Executed