beenull/crowdsec
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Better wait. Defer Close.

Browse source
This commit is contained in:
Mathieu Lecarme 2022-06-16 23:27:15 +02:00 committed by lperdereau
parent 195adbadeb
commit 0dad75b91b
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkg/acquisition/modules/loki/loki.go
View file

@ -372,7 +372,7 @@ func (l *LokiSource) Dump() interface{} {
func (l *LokiSource) ready() error { func (l *LokiSource) ready() error {
client := &http.Client{ client := &http.Client{
Timeout: readyTimeout, Timeout: l.Config.WaitForReady,
} }
req, err := http.NewRequest("GET", l.lokiReady, nil) req, err := http.NewRequest("GET", l.lokiReady, nil)
@ -381,7 +381,7 @@ func (l *LokiSource) ready() error {
} }
req.Header = l.header req.Header = l.header
for i := 0; i < readyLoop; i++ { for i := 0; i < int(l.Config.WaitForReady/time.Second); i++ {
resp, err := client.Do(req) resp, err := client.Do(req)
if err != nil { if err != nil {
return errors.Wrap(err, "Test Loki services for readiness") return errors.Wrap(err, "Test Loki services for readiness")
@ -393,12 +393,9 @@ func (l *LokiSource) ready() error {
if err != nil { if err != nil {
return errors.Wrap(err, "can't read body while testing Loki readiness") return errors.Wrap(err, "can't read body while testing Loki readiness")
} }
err = resp.Body.Close() defer resp.Body.Close()
if err != nil { l.logger.WithField("status", resp.StatusCode).WithField("bofy", string(body)).Info("Loki is not ready")
return err time.Sleep(time.Second)
}
l.logger.Println("Loki is not ready :", string(body))
time.Sleep(10 * time.Second)
} }
} }