Improve logging readability

diff --git a/hotline/client.go b/hotline/client.go
index 3a6584af9384c5239efeae6d1246ee0c0923f71b..e5b396b75192f367239b99541edb225618b7a7b9 100644 (file)
--- a/hotline/client.go
+++ b/hotline/client.go
@@ -674,10 +674,7 @@ func (c *Client) HandleTransaction(t *Transaction) error {
        }
 
        requestNum := binary.BigEndian.Uint16(t.Type)
        }
 
        requestNum := binary.BigEndian.Uint16(t.Type)

-       c.Logger.Infow(
-               "Received Transaction",
-               "RequestType", requestNum,
-       )
+       c.Logger.Debugw("Received Transaction", "RequestType", requestNum)

 
        if handler, ok := c.Handlers[requestNum]; ok {
                outT, _ := handler.Handle(c, t)
 
        if handler, ok := c.Handlers[requestNum]; ok {
                outT, _ := handler.Handle(c, t)

diff --git a/hotline/client_conn.go b/hotline/client_conn.go
index 6a279776e7a38876164f931a727a322c1ba7c3b0..1186947ebeac57d3f469584ae60cafbe66f645ea 100644 (file)
--- a/hotline/client_conn.go
+++ b/hotline/client_conn.go
@@ -78,7 +78,7 @@ func (cc *ClientConn) handleTransaction(transaction *Transaction) error {
                        }
                }
 
                        }
                }
 

-               cc.logger.Infow("Received Transaction", "RequestType", handler.Name)
+               cc.logger.Debugw("Received Transaction", "RequestType", handler.Name)

 
                transactions, err := handler.Handler(cc, transaction)
                if err != nil {
 
                transactions, err := handler.Handler(cc, transaction)
                if err != nil {

diff --git a/hotline/server.go b/hotline/server.go
index e685afdbe7a76dee8e4b173d9702649800320f84..0677a813a6d48da4a2aaf99fca228d0c1a28c366 100644 (file)
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -193,8 +193,9 @@ func (s *Server) Serve(ctx context.Context, ln net.Listener) error {
                })
 
                go func() {
                })
 
                go func() {

+                       s.Logger.Infow("Connection established", "RemoteAddr", conn.RemoteAddr())
+

                        if err := s.handleNewConnection(connCtx, conn, conn.RemoteAddr().String()); err != nil {
                        if err := s.handleNewConnection(connCtx, conn, conn.RemoteAddr().String()); err != nil {

-                               s.Logger.Infow("New client connection established", "RemoteAddr", conn.RemoteAddr())

                                if err == io.EOF {
                                        s.Logger.Infow("Client disconnected", "RemoteAddr", conn.RemoteAddr())
                                } else {
                                if err == io.EOF {
                                        s.Logger.Infow("Client disconnected", "RemoteAddr", conn.RemoteAddr())
                                } else {


@@ -568,6 +569,8 @@ func (s *Server) handleNewConnection(ctx context.Context, conn io.ReadWriteClose
                login = GuestAccount
        }
 
                login = GuestAccount
        }
 

+       c.logger = s.Logger.With("remoteAddr", remoteAddr, "login", login)
+

        // If authentication fails, send error reply and close connection
        if !c.Authenticate(login, encodedPassword) {
                t := c.NewErrReply(clientLogin, "Incorrect login.")
        // If authentication fails, send error reply and close connection
        if !c.Authenticate(login, encodedPassword) {
                t := c.NewErrReply(clientLogin, "Incorrect login.")


@@ -578,7 +581,10 @@ func (s *Server) handleNewConnection(ctx context.Context, conn io.ReadWriteClose
                if _, err := conn.Write(b); err != nil {
                        return err
                }
                if _, err := conn.Write(b); err != nil {
                        return err
                }

-               return fmt.Errorf("incorrect login")
+
+               c.logger.Infow("Login failed", "clientVersion", fmt.Sprintf("%x", *c.Version))
+
+               return nil

        }
 
        if clientLogin.GetField(fieldUserName).Data != nil {
        }
 
        if clientLogin.GetField(fieldUserName).Data != nil {


@@ -595,10 +601,6 @@ func (s *Server) handleNewConnection(ctx context.Context, conn io.ReadWriteClose
                *c.Flags = []byte{0, 2}
        }
 
                *c.Flags = []byte{0, 2}
        }
 

-       c.logger = s.Logger.With("remoteAddr", remoteAddr, "login", login)
-
-       c.logger.Infow("Client connection received", "version", fmt.Sprintf("%x", *c.Version))
-

        s.outbox <- c.NewReply(clientLogin,
                NewField(fieldVersion, []byte{0x00, 0xbe}),
                NewField(fieldCommunityBannerID, []byte{0, 0}),
        s.outbox <- c.NewReply(clientLogin,
                NewField(fieldVersion, []byte{0x00, 0xbe}),
                NewField(fieldCommunityBannerID, []byte{0, 0}),


@@ -615,6 +617,7 @@ func (s *Server) handleNewConnection(ctx context.Context, conn io.ReadWriteClose
        if *c.Version == nil || bytes.Equal(*c.Version, nostalgiaVersion) {
                c.Agreed = true
                c.logger = c.logger.With("name", string(c.UserName))
        if *c.Version == nil || bytes.Equal(*c.Version, nostalgiaVersion) {
                c.Agreed = true
                c.logger = c.logger.With("name", string(c.UserName))

+               c.logger.Infow("Login successful", "clientVersion", fmt.Sprintf("%x", *c.Version))

 
                for _, t := range c.notifyOthers(
                        *NewTransaction(
 
                for _, t := range c.notifyOthers(
                        *NewTransaction(

diff --git a/hotline/transaction_handlers.go b/hotline/transaction_handlers.go
index 735e155a951dd81befd5d4863506afe28d047245..7f29d7385cdacb4dde07a44eb16483ab7191a789 100644 (file)
--- a/hotline/transaction_handlers.go
+++ b/hotline/transaction_handlers.go
@@ -907,6 +907,7 @@ func HandleTranAgreed(cc *ClientConn, t *Transaction) (res []Transaction, err er
        *cc.Icon = t.GetField(fieldUserIconID).Data
 
        cc.logger = cc.logger.With("name", string(cc.UserName))
        *cc.Icon = t.GetField(fieldUserIconID).Data
 
        cc.logger = cc.logger.With("name", string(cc.UserName))

+       cc.logger.Infow("Login successful", "clientVersion", fmt.Sprintf("%x", *cc.Version))

 
        options := t.GetField(fieldOptions).Data
        optBitmap := big.NewInt(int64(binary.BigEndian.Uint16(options)))
 
        options := t.GetField(fieldOptions).Data
        optBitmap := big.NewInt(int64(binary.BigEndian.Uint16(options)))