|
|
|
@ -427,12 +427,12 @@ handleConnected = do |
|
|
|
case v of |
|
|
|
case v of |
|
|
|
Left result -> do |
|
|
|
Left result -> do |
|
|
|
case headMay (parseXML result) >>= parseContent of |
|
|
|
case headMay (parseXML result) >>= parseContent of |
|
|
|
Just (TransaqResponseResult (ResponseSuccess (Just transactionId))) -> do |
|
|
|
Just (TransaqResponseResult (ResponseSuccess (Just transactionId'))) -> do |
|
|
|
brState <- asks brokerState |
|
|
|
brState <- asks brokerState |
|
|
|
respVar <- asks responseVar |
|
|
|
respVar <- asks responseVar |
|
|
|
liftIO $ atomically $ do |
|
|
|
liftIO $ atomically $ do |
|
|
|
modifyTVar' (bsOrderMap brState) (M.insert (orderId order) order) |
|
|
|
modifyTVar' (bsOrderMap brState) (M.insert (orderId order) order) |
|
|
|
modifyTVar' (bsOrderTransactionIdMap brState) (BM.insert (orderId order) (TransactionId transactionId)) |
|
|
|
modifyTVar' (bsOrderTransactionIdMap brState) (BM.insert (orderId order) (TransactionId transactionId')) |
|
|
|
resp <- readTMVar respVar |
|
|
|
resp <- readTMVar respVar |
|
|
|
putTMVar resp ResponseOrderSubmitted |
|
|
|
putTMVar resp ResponseOrderSubmitted |
|
|
|
maybeCb <- liftIO $ readTVarIO (bsNotificationCallback brState) |
|
|
|
maybeCb <- liftIO $ readTVarIO (bsNotificationCallback brState) |
|
|
|
@ -442,7 +442,7 @@ handleConnected = do |
|
|
|
liftIO $ cb notif |
|
|
|
liftIO $ cb notif |
|
|
|
_ -> pure () |
|
|
|
_ -> pure () |
|
|
|
log Debug "TXMLConnector.WorkThread" $ "Inserting orderid: " <> |
|
|
|
log Debug "TXMLConnector.WorkThread" $ "Inserting orderid: " <> |
|
|
|
(T.pack . show) (orderId order) <> " <-> " <> (T.pack . show) transactionId |
|
|
|
(T.pack . show) (orderId order) <> " <-> " <> (T.pack . show) transactionId' |
|
|
|
Just (TransaqResponseResult (ResponseFailure err)) -> do |
|
|
|
Just (TransaqResponseResult (ResponseFailure err)) -> do |
|
|
|
brState <- asks brokerState |
|
|
|
brState <- asks brokerState |
|
|
|
log Debug "TXMLConnector.WorkThread" $ "Order submission failure: " <> err |
|
|
|
log Debug "TXMLConnector.WorkThread" $ "Order submission failure: " <> err |
|
|
|
@ -515,8 +515,9 @@ handleGetInfo = do |
|
|
|
pure $ Just StageConnection |
|
|
|
pure $ Just StageConnection |
|
|
|
Transaq.Connected -> do |
|
|
|
Transaq.Connected -> do |
|
|
|
log Info "TXMLConnector.WorkThread" "Server connected" |
|
|
|
log Info "TXMLConnector.WorkThread" "Server connected" |
|
|
|
|
|
|
|
when (transaqPassword cfg /= transaqNewPassword cfg) $ |
|
|
|
void $ sendCommand $ toXml $ |
|
|
|
void $ sendCommand $ toXml $ |
|
|
|
CommandChangePass (transaqPassword cfg) "goobaka12" |
|
|
|
CommandChangePass (transaqPassword cfg) (transaqNewPassword cfg) |
|
|
|
v <- makeSubscriptions cfg |
|
|
|
v <- makeSubscriptions cfg |
|
|
|
case v of |
|
|
|
case v of |
|
|
|
Left _ -> do |
|
|
|
Left _ -> do |
|
|
|
|