genofire/golang-lib
genofire
/
golang-lib
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improve logging

This commit is contained in:
Martin/Geno 2019-01-13 22:36:40 +01:00
parent ce7ba16090
commit bb4d844ad2
No known key found for this signature in database
GPG Key ID: 9D7D3C6BFF600C6A
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
database/main.go
View File

@ -8,7 +8,7 @@ import (
_ "github.com/jinzhu/gorm/dialects/postgres" _ "github.com/jinzhu/gorm/dialects/postgres"
_ "github.com/jinzhu/gorm/dialects/sqlite" _ "github.com/jinzhu/gorm/dialects/sqlite"
log "github.com/sirupsen/logrus" "github.com/bdlm/log"
) )
// Write Database connection for writing purposes // Write Database connection for writing purposes

10
websocket/client.go
View File

@ -2,7 +2,7 @@ package websocket
import ( import (
"github.com/google/uuid" "github.com/google/uuid"
log "github.com/sirupsen/logrus" "github.com/bdlm/log"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
) )
@ -22,7 +22,7 @@ type Client struct {
// NewClient by websocket // NewClient by websocket
func NewClient(s *Server, ws *websocket.Conn) *Client { func NewClient(s *Server, ws *websocket.Conn) *Client {
if ws == nil { if ws == nil {
log.Panic("ws cannot be nil") log.WithField("modul", "websocket").Panic("client cannot be created without websocket")
} }
return &Client{ return &Client{
server: s, server: s,
@ -56,7 +56,7 @@ func (c *Client) Write(msg *Message) {
func (c *Client) Close() { func (c *Client) Close() {
c.writeQuit <- true c.writeQuit <- true
c.readQuit <- true c.readQuit <- true
log.Info("client disconnecting...", c.GetID()) log.WithField("modul", "websocket").Info("client disconnecting...", c.GetID())
} }
// Listen write and read request via channel // Listen write and read request via channel
@ -76,7 +76,7 @@ func (c *Client) handleInput(msg *Message) {
msg.server = c.server msg.server = c.server
c.server.msgChanIn <- msg c.server.msgChanIn <- msg
} else { } else {
log.Println("no valid msg for:", c.GetID(), "error:", err, "\nmessage:", msg) log.WithField("modul", "websocket").Println("no valid msg for:", c.GetID(), "error:", err, "\nmessage:", msg)
} }
} }
@ -112,7 +112,7 @@ func (c *Client) listenRead() {
if websocket.IsCloseError(err, websocket.CloseGoingAway) { if websocket.IsCloseError(err, websocket.CloseGoingAway) {
return return
} else if err != nil { } else if err != nil {
log.Infof("error on reading %s: %s", c.GetID(), err) log.WithField("modul", "websocket").Warnf("error on reading %s: %s", c.GetID(), err)
return return
} else { } else {
c.handleInput(&msg) c.handleInput(&msg)

4
websocket/server.go
View File

@ -5,7 +5,7 @@ import (
"sync" "sync"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
log "github.com/sirupsen/logrus" "github.com/bdlm/log"
) )
// Server of websocket // Server of websocket
@ -34,7 +34,7 @@ func NewServer(msgChanIn chan *Message, sessionManager *SessionManager) *Server
func (s *Server) Handler(w http.ResponseWriter, r *http.Request) { func (s *Server) Handler(w http.ResponseWriter, r *http.Request) {
conn, err := s.upgrader.Upgrade(w, r, nil) conn, err := s.upgrader.Upgrade(w, r, nil)
if err != nil { if err != nil {
log.Info(err) log.WithField("modul", "websocket").Warnf("error during upgrade to websocket: %s", err)
return return
} }
client := NewClient(s, conn) client := NewClient(s, conn)