Use client logger

diff --git a/hotline/client_conn.go b/hotline/client_conn.go
index 4e703c2762b53961cecd0db5d8af94c5d9a10954..a3c5258c48b9963ea292c1c9fd10a719ad3c2f31 100644 (file)
--- a/hotline/client_conn.go
+++ b/hotline/client_conn.go
@@ -83,26 +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.logger.Infow(
-                       "Received Transaction",
-                       "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()

diff --git a/hotline/server.go b/hotline/server.go
index 9cec83bd793276245f1e09c42fa08a9c00b0fb1a..a91e1c817b5f0b2656d0c22704f8544704626eb3 100644 (file)
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -638,7 +638,7 @@ func (s *Server) handleNewConnection(ctx context.Context, conn net.Conn, remoteA
                // into a slice of transactions
                var transactions []Transaction
                if transactions, tReadlen, err = readTransactions(tranBuff); err != nil {
-                       c.Server.Logger.Errorw("Error handling transaction", "err", err)
+                       c.logger.Errorw("Error handling transaction", "err", err)
                }
 
                // iterate over all the transactions that were parsed from the byte slice and handle them