From 648396f234634541ac6a4ad7acf8306be5a5d772 Mon Sep 17 00:00:00 2001 From: Bruno Michel Date: Thu, 24 Oct 2024 18:05:32 +0200 Subject: [PATCH 1/2] Do not index trashed file --- model/rag/index.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/rag/index.go b/model/rag/index.go index 81f80541a3b..4add63fee82 100644 --- a/model/rag/index.go +++ b/model/rag/index.go @@ -85,7 +85,7 @@ func callRAGIndexer(inst *instance.Instance, doctype string, change couchdb.Chan return err } u.Path = fmt.Sprintf("/docs/%s/%s/%s", inst.Domain, doctype, change.DocID) - if change.Deleted { + if change.Deleted || change.Doc.Get("trashed") == true { req, err := http.NewRequest(http.MethodDelete, u.String(), nil) if err != nil { return err From 00d61ad7906113a8138d68593587a9283be6ef80 Mon Sep 17 00:00:00 2001 From: Bruno Michel Date: Thu, 24 Oct 2024 18:07:08 +0200 Subject: [PATCH 2/2] Do not stop indexer on RAG error --- model/rag/index.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/model/rag/index.go b/model/rag/index.go index 4add63fee82..3962e90932f 100644 --- a/model/rag/index.go +++ b/model/rag/index.go @@ -53,10 +53,11 @@ func Index(inst *instance.Instance, logger logger.Logger, msg IndexMessage) erro return nil } + var errj error for _, change := range feed.Results { if err := callRAGIndexer(inst, msg.Doctype, change); err != nil { logger.Warnf("Index error: %s", err) - return err + errj = errors.Join(errj, err) } } _ = updateLastSequenceNumber(inst, msg.Doctype, feed.LastSeq) @@ -65,7 +66,7 @@ func Index(inst *instance.Instance, logger logger.Logger, msg IndexMessage) erro _ = pushJob(inst, msg.Doctype) } - return nil + return errj } func callRAGIndexer(inst *instance.Instance, doctype string, change couchdb.Change) error {