diff options
| author | Jeff Halter <868228+jhalter@users.noreply.github.com> | 2022-06-21 14:03:10 -0700 |
|---|---|---|
| committer | Jeff Halter <868228+jhalter@users.noreply.github.com> | 2022-06-21 14:03:10 -0700 |
| commit | 0fcfa5d54b166559c0ca31932a71a7eabb79c72c (patch) | |
| tree | b9bb721f102640daf5c0ca02a77f7e5cfcdb284c | |
| parent | 9c6291aa00db7b7e1d262e0465bfc7e08fc28807 (diff) | |
Use client logger
| -rw-r--r-- | hotline/client_conn.go | 19 | ||||
| -rw-r--r-- | hotline/server.go | 2 |
2 files changed, 8 insertions, 13 deletions
diff --git a/hotline/client_conn.go b/hotline/client_conn.go index 4e703c2..a3c5258 100644 --- 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 9cec83b..a91e1c8 100644 --- 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 |