d0zingcat/gocryptotrader
1
0
Fork 0
mirror of https://github.com/d0zingcat/gocryptotrader.git synced 2026-05-20 15:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement Logger (#228)

Browse Source 
* Added new base logger

* updated example and test configs

* updated exchange helpers restful router & server

* logPath is now passed to the logger to remove dependency on common package

* updated everything besides exchanges to use new logger

* alphapoint to bitmex done

* updated bitmex bitstamp bittrex btcc and also performance changes to logger

* btcmarkets coinbase coinut exmo gateio wrappers updated

* gateio and gemini logger updated

* hitbtc huobi itbit & kraken updated

* All exchanges updatd

* return correct error for disabled websocket

* don't disconnect client on invalid json

* updated router internal logging

* log.Fatal to t.Error for tests

* Changed from fatal to error failure to set maxprocs

* output ANSI codes for everything but windows for now due to lack of windows support

* added error handling to logger and unit tests

* clear wording on print -> log.print

* added benchmark test

* cleaned up import sections

* Updated logger based on PR requests (added default config options on failure/setting errors)

* ah this should fix travici enc config issue

* Load entire config and clear out logging to hopefully fix travisci issue

* wording & test error handling

* fixed formatting issues based on feedback

* fixed formatting issues based on feedback

* changed CheckDir to use mkdirall instead of mkdir and other changes based on feedback
This commit is contained in:
Andrew
2019-01-08 21:56:22 +11:00
committed by Adrian Gallagher
parent bfbd496c3a
commit d01e7bad72
103 changed files with 1028 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
websocket.go
View File

@@ -2,13 +2,13 @@ package main
import (
"errors"
"log"
"net/http"
"github.com/gorilla/websocket"
"github.com/thrasher-/gocryptotrader/common"
"github.com/thrasher-/gocryptotrader/config"
"github.com/thrasher-/gocryptotrader/currency"
log "github.com/thrasher-/gocryptotrader/logger"
)
// Const vars for websocket
@@ -102,7 +102,7 @@ func (h *WebsocketHub) run() {
h.Clients[client] = true
case client := <-h.Unregister:
if _, ok := h.Clients[client]; ok {
log.Printf("websocket: disconnected client")
log.Debugln("websocket: disconnected client")
delete(h.Clients, client)
close(client.Send)
}
@@ -111,7 +111,7 @@ func (h *WebsocketHub) run() {
select {
case client.Send <- message:
default:
log.Printf("websocket: disconnected client")
log.Debugln("websocket: disconnected client")
close(client.Send)
delete(h.Clients, client)
}
@@ -124,7 +124,7 @@ func (h *WebsocketHub) run() {
func (c *WebsocketClient) SendWebsocketMessage(evt interface{}) error {
data, err := common.JSONEncode(evt)
if err != nil {
log.Printf("websocket: failed to send message: %s", err)
log.Errorf("websocket: failed to send message: %s", err)
return err
}
@@ -142,7 +142,7 @@ func (c *WebsocketClient) read() {
msgType, message, err := c.Conn.ReadMessage()
if err != nil {
if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) {
log.Printf("websocket: client disconnected, err: %s", err)
log.Errorf("websocket: client disconnected, err: %s", err)
}
break
}
@@ -151,39 +151,39 @@ func (c *WebsocketClient) read() {
var evt WebsocketEvent
err := common.JSONDecode(message, &evt)
if err != nil {
log.Printf("websocket: failed to decode JSON sent from client %s", err)
break
log.Errorf("websocket: failed to decode JSON sent from client %s", err)
continue
}
if evt.Event == "" {
log.Printf("websocket: client sent a blank event, disconnecting")
break
log.Warnf("websocket: client sent a blank event, disconnecting")
continue
}
dataJSON, err := common.JSONEncode(evt.Data)
if err != nil {
log.Printf("websocket: client sent data we couldn't JSON decode")
log.Errorf("websocket: client sent data we couldn't JSON decode")
break
}
req := common.StringToLower(evt.Event)
log.Printf("websocket: request received: %s", req)
log.Debugf("websocket: request received: %s", req)
result, ok := wsHandlers[req]
if !ok {
log.Printf("websocket: unsupported event")
log.Debugln("websocket: unsupported event")
continue
}
if result.authRequired && !c.Authenticated {
log.Printf("Websocket: request %s failed due to unauthenticated request on an authenticated API", evt.Event)
log.Warnf("Websocket: request %s failed due to unauthenticated request on an authenticated API", evt.Event)
c.SendWebsocketMessage(WebsocketEventResponse{Event: evt.Event, Error: "unauthorised request on authenticated API"})
continue
}
err = result.handler(c, dataJSON)
if err != nil {
log.Printf("websocket: request %s failed. Error %s", evt.Event, err)
log.Errorf("websocket: request %s failed. Error %s", evt.Event, err)
continue
}
}
@@ -199,13 +199,13 @@ func (c *WebsocketClient) write() {
case message, ok := <-c.Send:
if !ok {
c.Conn.WriteMessage(websocket.CloseMessage, []byte{})
log.Printf("websocket: hub closed the channel")
log.Debugln("websocket: hub closed the channel")
return
}
w, err := c.Conn.NextWriter(websocket.TextMessage)
if err != nil {
log.Printf("websocket: failed to create new io.writeCloser: %s", err)
log.Errorf("websocket: failed to create new io.writeCloser: %s", err)
return
}
w.Write(message)
@@ -217,7 +217,7 @@ func (c *WebsocketClient) write() {
}
if err := w.Close(); err != nil {
log.Printf("websocket: failed to close io.WriteCloser: %s", err)
log.Errorf("websocket: failed to close io.WriteCloser: %s", err)
return
}
}
@@ -260,7 +260,7 @@ func WebsocketClientHandler(w http.ResponseWriter, r *http.Request) {
numClients := len(wsHub.Clients)
if numClients >= connectionLimit {
log.Printf("websocket: client rejected due to websocket client limit reached. Number of clients %d. Limit %d.",
log.Warnf("websocket: client rejected due to websocket client limit reached. Number of clients %d. Limit %d.",
numClients, connectionLimit)
w.WriteHeader(http.StatusForbidden)
return
@@ -279,13 +279,13 @@ func WebsocketClientHandler(w http.ResponseWriter, r *http.Request) {
conn, err := upgrader.Upgrade(w, r, nil)
if err != nil {
log.Println(err)
log.Error(err)
return
}
client := &WebsocketClient{Hub: wsHub, Conn: conn, Send: make(chan []byte, 1024)}
client.Hub.Register <- client
log.Printf("websocket: client connected. Connected clients: %d. Limit %d.",
log.Debugf("websocket: client connected. Connected clients: %d. Limit %d.",
numClients+1, connectionLimit)
go client.read()
@@ -306,10 +306,11 @@ func wsAuth(client *WebsocketClient, data interface{}) error {
}
hashPW := common.HexEncodeToString(common.GetSHA256([]byte(bot.config.Webserver.AdminPassword)))
if auth.Username == bot.config.Webserver.AdminUsername && auth.Password == hashPW {
client.Authenticated = true
wsResp.Data = WebsocketResponseSuccess
log.Println("websocket: client authenticated successfully")
log.Debugf("websocket: client authenticated successfully")
return client.SendWebsocketMessage(wsResp)
}
@@ -317,13 +318,13 @@ func wsAuth(client *WebsocketClient, data interface{}) error {
client.authFailures++
client.SendWebsocketMessage(wsResp)
if client.authFailures >= bot.config.Webserver.WebsocketMaxAuthFailures {
log.Printf("websocket: disconnecting client, maximum auth failures threshold reached (failures: %d limit: %d)",
log.Debugf("websocket: disconnecting client, maximum auth failures threshold reached (failures: %d limit: %d)",
client.authFailures, bot.config.Webserver.WebsocketMaxAuthFailures)
wsHub.Unregister <- client
return nil
}
log.Printf("websocket: client sent wrong username/password (failures: %d limit: %d)",
log.Debugf("websocket: client sent wrong username/password (failures: %d limit: %d)",
client.authFailures, bot.config.Webserver.WebsocketMaxAuthFailures)
return nil
}