Commit dde0b897 authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Remove client address from WebSocket session errors messages.

parent b44817ae

CHANGELOG.md

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr 
## [Unreleased]

### Changed

- Default maximum database connection lifetime is now 1 hour.

- Improved parsing of client address and port for incoming requests and socket connections.

- Improved parsing of client IP and port for incoming requests and socket connections.

- WebSocket sessions no longer log the client IP and port number in error messages.



### Fixed

- CRON expressions for leaderboard and tournament resets now allow concurrent processing.

server/session_ws.go

+7 −7
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ func (s *sessionWS) pingNow() bool { 
	err := s.conn.WriteMessage(websocket.PingMessage, []byte{})

	s.Unlock()

	if err != nil {

		s.logger.Warn("Could not send ping", zap.String("remoteAddress", fmt.Sprintf("%v:%v", s.clientIP, s.clientPort)), zap.Error(err))

		s.logger.Warn("Could not send ping", zap.Error(err))

		return false

	}
@@ -398,7 +398,7 @@ func (s *sessionWS) Close() { 
	s.ctxCancelFn()



	if s.logger.Core().Enabled(zap.DebugLevel) {

		s.logger.Info("Cleaning up closed client connection", zap.String("remoteAddress", fmt.Sprintf("%v:%v", s.clientIP, s.clientPort)))

		s.logger.Info("Cleaning up closed client connection")

	}



	// When connection close originates internally in the session, ensure cleanup of external resources and references.
@@ -406,15 +406,15 @@ func (s *sessionWS) Close() { 
		s.logger.Warn("Failed to remove all matchmaking tickets", zap.Error(err))

	}

	if s.logger.Core().Enabled(zap.DebugLevel) {

		s.logger.Info("Cleaned up closed connection matchmaker", zap.String("remoteAddress", fmt.Sprintf("%v:%v", s.clientIP, s.clientPort)))

		s.logger.Info("Cleaned up closed connection matchmaker")

	}

	s.tracker.UntrackAll(s.id)

	if s.logger.Core().Enabled(zap.DebugLevel) {

		s.logger.Info("Cleaned up closed connection tracker", zap.String("remoteAddress", fmt.Sprintf("%v:%v", s.clientIP, s.clientPort)))

		s.logger.Info("Cleaned up closed connection tracker")

	}

	s.sessionRegistry.Remove(s.id)

	if s.logger.Core().Enabled(zap.DebugLevel) {

		s.logger.Info("Cleaned up closed connection session registry", zap.String("remoteAddress", fmt.Sprintf("%v:%v", s.clientIP, s.clientPort)))

		s.logger.Info("Cleaned up closed connection session registry")

	}



	// Clean up internals.
@@ -423,11 +423,11 @@ func (s *sessionWS) Close() { 


	// Send close message.

	if err := s.conn.WriteControl(websocket.CloseMessage, []byte{}, time.Now().Add(s.writeWaitDuration)); err != nil {

		s.logger.Debug("Could not send close message", zap.String("remoteAddress", fmt.Sprintf("%v:%v", s.clientIP, s.clientPort)), zap.Error(err))

		s.logger.Debug("Could not send close message", zap.Error(err))

	}

	// Close WebSocket.

	if err := s.conn.Close(); err != nil {

		s.logger.Debug("Could not close", zap.String("remoteAddress", fmt.Sprintf("%v:%v", s.clientIP, s.clientPort)), zap.Error(err))

		s.logger.Debug("Could not close", zap.Error(err))

	}



	s.logger.Info("Closed client connection")