patch: v0.6.1

[rbdr/mobius] / hotline / client_conn.go

diff --git a/hotline/client_conn.go b/hotline/client_conn.go
index a8ace87fe42c65cfa04c0e95923b1e5b60cf963e..997b9c921a50966cd368f27b3cf48739cc41c16a 100644 (file)
--- a/hotline/client_conn.go
+++ b/hotline/client_conn.go
@@ -2,6 +2,7 @@ package hotline
 
 import (
        "encoding/binary"
+       "go.uber.org/zap"
        "golang.org/x/crypto/bcrypt"
        "io"
        "math/big"
@@ -65,6 +66,7 @@ type ClientConn struct {
        AutoReply  []byte
        Transfers  map[int][]*FileTransfer
        Agreed     bool
+       logger     *zap.SugaredLogger
 }
 
 func (cc *ClientConn) sendAll(t int, fields ...Field) {
@@ -81,28 +83,23 @@ func (cc *ClientConn) handleTransaction(transaction *Transaction) error {
 
                        // Validate that required field is present
                        if field.ID == nil {
-                               cc.Server.Logger.Errorw(
+                               cc.logger.Errorw(
                                        "Missing required field",
-                                       "Account", cc.Account.Login, "UserName", string(cc.UserName), "RequestType", handler.Name, "FieldID", reqField.ID,
+                                       "RequestType", handler.Name, "FieldID", reqField.ID,
                                )
                                return nil
                        }
 
                        if len(field.Data) < reqField.minLen {
-                               cc.Server.Logger.Infow(
+                               cc.logger.Infow(
                                        "Field does not meet minLen",
-                                       "Account", cc.Account.Login, "UserName", string(cc.UserName), "RequestType", handler.Name, "FieldID", reqField.ID,
+                                       "RequestType", handler.Name, "FieldID", reqField.ID,
                                )
                                return nil
                        }
                }
 
-               cc.Server.Logger.Infow(
-                       "Received Transaction",
-                       "login", cc.Account.Login,
-                       "name", string(cc.UserName),
-                       "RequestType", handler.Name,
-               )
+               cc.logger.Infow("Received Transaction", "RequestType", handler.Name)
 
                transactions, err := handler.Handler(cc, transaction)
                if err != nil {
@@ -112,10 +109,8 @@ func (cc *ClientConn) handleTransaction(transaction *Transaction) error {
                        cc.Server.outbox <- t
                }
        } else {
-               cc.Server.Logger.Errorw(
-                       "Unimplemented transaction type received",
-                       "UserName", string(cc.UserName), "RequestID", requestNum,
-               )
+               cc.logger.Errorw(
+                       "Unimplemented transaction type received", "RequestID", requestNum)
        }
 
        cc.Server.mux.Lock()
@@ -177,7 +172,9 @@ func (cc *ClientConn) Disconnect() {
 
        delete(cc.Server.Clients, binary.BigEndian.Uint16(*cc.ID))
 
-       cc.notifyOthers(*NewTransaction(tranNotifyDeleteUser, nil, NewField(fieldUserID, *cc.ID)))
+       for _, t := range cc.notifyOthers(*NewTransaction(tranNotifyDeleteUser, nil, NewField(fieldUserID, *cc.ID))) {
+               cc.Server.outbox <- t
+       }
 
        if err := cc.Connection.Close(); err != nil {
                cc.Server.Logger.Errorw("error closing client connection", "RemoteAddr", cc.RemoteAddr)
@@ -185,13 +182,14 @@ func (cc *ClientConn) Disconnect() {
 }
 
 // notifyOthers sends transaction t to other clients connected to the server
-func (cc *ClientConn) notifyOthers(t Transaction) {
+func (cc *ClientConn) notifyOthers(t Transaction) (trans []Transaction) {
        for _, c := range sortedClients(cc.Server.Clients) {
                if c.ID != cc.ID && c.Agreed {
                        t.clientID = c.ID
-                       cc.Server.outbox <- t
+                       trans = append(trans, t)
                }
        }
+       return trans
 }
 
 // NewReply returns a reply Transaction with fields for the ClientConn