Cleanup non-needed log.Fatal's in various files

This commit is contained in:
Adrian Gallagher
2019-01-17 14:10:56 +11:00
parent 84a67359c9
commit 7413fc41b8
6 changed files with 73 additions and 64 deletions

View File

@@ -191,7 +191,8 @@ func (b *Bitstamp) WsReadData() {
result := PusherOrderbook{}
err := common.JSONDecode([]byte(data.Data), &result)
if err != nil {
log.Fatal(err)
b.Websocket.DataHandler <- err
continue
}
currencyPair := common.SplitStrings(data.Channel, "_")
@@ -200,6 +201,7 @@ func (b *Bitstamp) WsReadData() {
err = b.WsUpdateOrderbook(result, p, "SPOT")
if err != nil {
b.Websocket.DataHandler <- err
continue
}
case trade := <-b.WebsocketConn.Trade:
@@ -208,7 +210,8 @@ func (b *Bitstamp) WsReadData() {
result := PusherTrade{}
err := common.JSONDecode([]byte(trade.Data), &result)
if err != nil {
log.Fatal(err)
b.Websocket.DataHandler <- err
continue
}
currencyPair := common.SplitStrings(trade.Channel, "_")
@@ -235,12 +238,14 @@ func (b *Bitstamp) WsUpdateOrderbook(ob PusherOrderbook, p pair.CurrencyPair, as
for _, ask := range ob.Asks {
target, err := strconv.ParseFloat(ask[0], 64)
if err != nil {
log.Fatal(err)
b.Websocket.DataHandler <- err
continue
}
amount, err := strconv.ParseFloat(ask[1], 64)
if err != nil {
log.Fatal(err)
b.Websocket.DataHandler <- err
continue
}
asks = append(asks, orderbook.Item{Price: target, Amount: amount})
@@ -251,12 +256,14 @@ func (b *Bitstamp) WsUpdateOrderbook(ob PusherOrderbook, p pair.CurrencyPair, as
for _, bid := range ob.Bids {
target, err := strconv.ParseFloat(bid[0], 64)
if err != nil {
log.Fatal(err)
b.Websocket.DataHandler <- err
continue
}
amount, err := strconv.ParseFloat(bid[1], 64)
if err != nil {
log.Fatal(err)
b.Websocket.DataHandler <- err
continue
}
bids = append(bids, orderbook.Item{Price: target, Amount: amount})

View File

@@ -125,7 +125,8 @@ func (b *BTCC) WsHandleData() {
var Result WsResponseMain
err := common.JSONDecode(resp.Raw, &Result)
if err != nil {
log.Fatal(err)
b.Websocket.DataHandler <- err
continue
}
switch Result.MsgType {

View File

@@ -13,7 +13,6 @@ import (
"github.com/thrasher-/gocryptotrader/currency/pair"
exchange "github.com/thrasher-/gocryptotrader/exchanges"
"github.com/thrasher-/gocryptotrader/exchanges/orderbook"
log "github.com/thrasher-/gocryptotrader/logger"
)
const (
@@ -143,7 +142,8 @@ func (c *CoinbasePro) WsHandleData() {
msgType := MsgType{}
err := common.JSONDecode(resp.Raw, &msgType)
if err != nil {
log.Fatal(err)
c.Websocket.DataHandler <- err
continue
}
if msgType.Type == "subscriptions" || msgType.Type == "heartbeat" {
@@ -158,7 +158,8 @@ func (c *CoinbasePro) WsHandleData() {
ticker := WebsocketTicker{}
err := common.JSONDecode(resp.Raw, &ticker)
if err != nil {
log.Fatal(err)
c.Websocket.DataHandler <- err
continue
}
c.Websocket.DataHandler <- exchange.TickerData{
@@ -176,28 +177,29 @@ func (c *CoinbasePro) WsHandleData() {
snapshot := WebsocketOrderbookSnapshot{}
err := common.JSONDecode(resp.Raw, &snapshot)
if err != nil {
log.Fatal(err)
c.Websocket.DataHandler <- err
continue
}
err = c.ProcessSnapshot(snapshot)
if err != nil {
log.Fatal(err)
c.Websocket.DataHandler <- err
continue
}
case "l2update":
update := WebsocketL2Update{}
err := common.JSONDecode(resp.Raw, &update)
if err != nil {
log.Fatal(err)
c.Websocket.DataHandler <- err
continue
}
err = c.ProcessUpdate(update)
if err != nil {
log.Fatal(err)
c.Websocket.DataHandler <- err
continue
}
default:
log.Fatal("Edge test", string(resp.Raw))
}
}
}

View File

@@ -12,7 +12,6 @@ import (
"github.com/thrasher-/gocryptotrader/currency/pair"
exchange "github.com/thrasher-/gocryptotrader/exchanges"
"github.com/thrasher-/gocryptotrader/exchanges/orderbook"
log "github.com/thrasher-/gocryptotrader/logger"
)
const coinutWebsocketURL = "wss://wsapi.coinut.com"
@@ -73,7 +72,8 @@ func (c *COINUT) WsHandleData() {
var incoming wsResponse
err := common.JSONDecode(resp.Raw, &incoming)
if err != nil {
log.Fatal(err)
c.Websocket.DataHandler <- err
continue
}
switch incoming.Reply {
@@ -84,7 +84,8 @@ func (c *COINUT) WsHandleData() {
var ticker WsTicker
err := common.JSONDecode(resp.Raw, &ticker)
if err != nil {
log.Fatal(err)
c.Websocket.DataHandler <- err
continue
}
c.Websocket.DataHandler <- exchange.TickerData{
@@ -101,12 +102,14 @@ func (c *COINUT) WsHandleData() {
var orderbooksnapshot WsOrderbookSnapshot
err := common.JSONDecode(resp.Raw, &orderbooksnapshot)
if err != nil {
log.Fatal(err)
c.Websocket.DataHandler <- err
continue
}
err = c.WsProcessOrderbookSnapshot(orderbooksnapshot)
if err != nil {
log.Fatal(err)
c.Websocket.DataHandler <- err
continue
}
currencyPair := instrumentListByCode[orderbooksnapshot.InstID]
@@ -121,12 +124,14 @@ func (c *COINUT) WsHandleData() {
var orderbookUpdate WsOrderbookUpdate
err := common.JSONDecode(resp.Raw, &orderbookUpdate)
if err != nil {
log.Fatal(err)
c.Websocket.DataHandler <- err
continue
}
err = c.WsProcessOrderbookUpdate(orderbookUpdate)
if err != nil {
log.Fatal(err)
c.Websocket.DataHandler <- err
continue
}
currencyPair := instrumentListByCode[orderbookUpdate.InstID]
@@ -141,14 +146,16 @@ func (c *COINUT) WsHandleData() {
var tradeSnap WsTradeSnapshot
err := common.JSONDecode(resp.Raw, &tradeSnap)
if err != nil {
log.Fatal(err)
c.Websocket.DataHandler <- err
continue
}
case "inst_trade_update":
var tradeUpdate WsTradeUpdate
err := common.JSONDecode(resp.Raw, &tradeUpdate)
if err != nil {
log.Fatal(err)
c.Websocket.DataHandler <- err
continue
}
currencyPair := instrumentListByCode[tradeUpdate.InstID]