Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions backend/pkg/transport/network/tcp/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,22 @@ func NewClient(address string, config ClientConfig, baseLogger zerolog.Logger) C

// Dial attempts to connect with the client
func (client *Client) Dial() (net.Conn, error) {
client.currentRetries = 0

var err error
var conn net.Conn
client.logger.Info().Msg("dialing")
for ; client.config.MaxConnectionRetries <= 0 || client.currentRetries < client.config.MaxConnectionRetries; client.currentRetries++ {
// The max connection retries will not work because the for loop never completes, it always returns and the function is called again by transport.
for client.config.MaxConnectionRetries <= 0 || client.currentRetries < client.config.MaxConnectionRetries {
client.currentRetries++
conn, err = client.config.DialContext(client.config.Context, "tcp", client.address)

backoffDuration := client.config.ConnectionBackoffFunction(client.currentRetries)
client.logger.Error().Stack().Err(err).Dur("backoff", backoffDuration).Int("retries", client.currentRetries+1).Msg("retrying")
time.Sleep(backoffDuration)

if err == nil {
client.logger.Info().Msg("connected")
client.currentRetries = 0
return conn, nil
}
if client.config.Context.Err() != nil {
Expand All @@ -55,10 +62,6 @@ func (client *Client) Dial() (net.Conn, error) {
client.logger.Error().Stack().Err(err).Msg("failed")
return nil, err
}

backoffDuration := client.config.ConnectionBackoffFunction(client.currentRetries)
client.logger.Debug().Stack().Err(err).Dur("backoff", backoffDuration).Int("retries", client.currentRetries+1).Msg("retrying")
time.Sleep(backoffDuration)
}

client.logger.Debug().Int("max", client.config.MaxConnectionRetries).Msg("max connection retries exceeded")
Expand Down
Loading