From 57adb949111b70566e75e8dd5409ab81607affc6 Mon Sep 17 00:00:00 2001 From: huanggze Date: Tue, 11 Aug 2020 15:11:04 +0800 Subject: [PATCH] fix: exported logs are incomplete Signed-off-by: huanggze --- .../client/logging/elasticsearch/elasticsearch.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkg/simple/client/logging/elasticsearch/elasticsearch.go b/pkg/simple/client/logging/elasticsearch/elasticsearch.go index 69081e2c..b3c9d64c 100644 --- a/pkg/simple/client/logging/elasticsearch/elasticsearch.go +++ b/pkg/simple/client/logging/elasticsearch/elasticsearch.go @@ -295,15 +295,14 @@ func (es *Elasticsearch) ExportLogs(sf logging.SearchFilter, w io.Writer) error for _, hit := range res.AllHits { data = append(data, hit.Log) } - if len(data) == 0 { - return nil - } // limit to retrieve max 100k records for i := 0; i < 100; i++ { - data, id, err = es.scroll(id) - if err != nil { - return err + if i != 0 { + data, id, err = es.scroll(id) + if err != nil { + return err + } } if len(data) == 0 { return nil -- GitLab