From: Jeff Halter Date: Wed, 29 Jun 2022 03:45:09 +0000 (-0700) Subject: Improve readability of client version in logs X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/commitdiff_plain/0db54aa79140c6656f99a851f582c84a0de04233?hp=-c Improve readability of client version in logs --- 0db54aa79140c6656f99a851f582c84a0de04233 diff --git a/hotline/server.go b/hotline/server.go index 3a43c95..ab61e81 100644 --- a/hotline/server.go +++ b/hotline/server.go @@ -669,7 +669,7 @@ func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser 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)) + c.logger.Infow("Login successful", "clientVersion", fmt.Sprintf("%v", func() int { i, _ := byteToInt(c.Version); return i }())) for _, t := range c.notifyOthers( *NewTransaction( diff --git a/hotline/transaction_handlers.go b/hotline/transaction_handlers.go index 8ba3632..9b25ef0 100644 --- a/hotline/transaction_handlers.go +++ b/hotline/transaction_handlers.go @@ -921,7 +921,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.logger.Infow("Login successful", "clientVersion", fmt.Sprintf("%x", cc.Version)) + cc.logger.Infow("Login successful", "clientVersion", fmt.Sprintf("%v", func() int { i, _ := byteToInt(cc.Version); return i }())) options := t.GetField(fieldOptions).Data optBitmap := big.NewInt(int64(binary.BigEndian.Uint16(options)))