eosswedenorg/thalos
1
0
Fork 0
mirror of https://github.com/eosswedenorg/thalos synced 2026-06-24 10:23:41 +02:00
Code Releases Activity

cmd/thalos/server.go: prefix ship connection logs with "ship client" and cleanup the messages abit.

Browse source
This commit is contained in:
Henrik Hautakoski 2024-02-18 20:35:23 +01:00
parent 3cb25a5717
commit bc46e516d9
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cmd/thalos/server.go
View file

@ -56,7 +56,7 @@ func readerLoop(conf *config.Config, running *bool, shClient *shipclient.Stream,
"max_interval": exp.MaxInterval, "max_interval": exp.MaxInterval,
"randomization_factor": exp.RandomizationFactor, "randomization_factor": exp.RandomizationFactor,
"multiplier": exp.Multiplier, "multiplier": exp.Multiplier,
}).Info("Connecting with Exponential Backoff") }).Info("ship client: Connecting with Exponential Backoff")
connectOp := func() error { connectOp := func() error {
recon_cnt++ recon_cnt++
@ -64,7 +64,7 @@ func readerLoop(conf *config.Config, running *bool, shClient *shipclient.Stream,
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"url": conf.Ship.Url, "url": conf.Ship.Url,
"try": recon_cnt, "try": recon_cnt,
}).Info("Connecting to ship") }).Info("ship client: Connecting")
if err := shClient.Connect(conf.Ship.Url); err != nil { if err := shClient.Connect(conf.Ship.Url); err != nil {
return err return err
@ -89,15 +89,15 @@ func readerLoop(conf *config.Config, running *bool, shClient *shipclient.Stream,
recon_cnt = 0 recon_cnt = 0
} }
log.WithError(err).Error("Failed to connect to SHIP") log.WithError(err).Error("ship client: Failed to connect")
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"reconn_at": time.Now().Add(d), "reconn_at": time.Now().Add(d),
"reconn_in": d, "reconn_in": d,
}).Info("Reconnecting in ", d) }).Info("ship client: Reconnecting in ", d)
}) })
if err != nil { if err != nil {
log.WithError(err).Error("Failed to connect to SHIP") log.WithError(err).Error("ship client:Failed to connect")
return return
} }
@ -105,21 +105,21 @@ func readerLoop(conf *config.Config, running *bool, shClient *shipclient.Stream,
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"start": shClient.StartBlock, "start": shClient.StartBlock,
"end": shClient.EndBlock, "end": shClient.EndBlock,
}).Info("Connected to ship") }).Info("ship client: Connected to ship")
if err := shClient.Run(); err != nil { if err := shClient.Run(); err != nil {
if errors.Is(err, shipclient.ErrEndBlockReached) { if errors.Is(err, shipclient.ErrEndBlockReached) {
log.Info("Endblock reached.") log.Info("ship client: Endblock reached.")
return return
} }
if shipws.IsCloseError(err) { if shipws.IsCloseError(err) {
log.Info("SHIP Connection closed") log.Info("ship client: Connection closed normally")
return return
} }
log.WithError(err).Error("Failed to read from ship") log.WithError(err).Error("ship client: Failed to read message")
} }
} }
} }