From 92e3ea565b0b0ae8cc1c171c7784bb382905300d Mon Sep 17 00:00:00 2001 From: Mathieu Lecarme Date: Tue, 7 Jun 2022 15:59:38 +0200 Subject: [PATCH] Lazy query. More error. --- pkg/acquisition/modules/loki/loki.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkg/acquisition/modules/loki/loki.go b/pkg/acquisition/modules/loki/loki.go index d0c83224e..0f05e4cc5 100644 --- a/pkg/acquisition/modules/loki/loki.go +++ b/pkg/acquisition/modules/loki/loki.go @@ -106,7 +106,9 @@ func (l *LokiSource) buildUrl() error { } buff.WriteByte('?') params := url.Values{} - params.Add("query", l.Config.Query) + if l.Config.Query != "" { + params.Add("query", l.Config.Query) + } params.Add("limit", fmt.Sprintf("%d", lokiLimit)) if l.Config.DelayFor != 0 { params.Add("delay_for", fmt.Sprintf("%d", int64(l.Config.DelayFor.Seconds()))) @@ -118,6 +120,7 @@ func (l *LokiSource) buildUrl() error { params.Add("start", fmt.Sprintf("%d", start.UnixNano())) buff.WriteString(params.Encode()) l.lokiWebsocket = buff.String() + l.logger.Info("Websocket url : ", l.lokiWebsocket) return nil } @@ -191,7 +194,7 @@ func (l *LokiSource) readOneTail(resp Tail, out chan types.Event) { func (l *LokiSource) StreamingAcquisition(out chan types.Event, t *tomb.Tomb) error { err := l.ready() if err != nil { - return errors.Wrap(err, "error while getting OneShotAcquisition") + return errors.Wrap(err, "error while getting StreamingAcquisition") } t.Go(func() error { for { @@ -200,8 +203,11 @@ func (l *LokiSource) StreamingAcquisition(out chan types.Event, t *tomb.Tomb) er header := &http.Header{} c, res, err := l.dialer.DialContext(ctx, l.lokiWebsocket, *header) if err != nil { - buf, _ := ioutil.ReadAll(res.Body) - return fmt.Errorf("loki websocket (%s) error %v : %s", l.lokiWebsocket, err, string(buf)) + buf, err2 := ioutil.ReadAll(res.Body) + if err2 == nil { + return fmt.Errorf("loki websocket (%s) error %v : %s", l.lokiWebsocket, err, string(buf)) + } + return err2 } defer c.Close() var resp Tail