refactor: add log

Rainsheep · Jan 12, 2024 · 70a8af3 · 70a8af3
1 parent 613777b
commit 70a8af3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/src/main/java/com/rs/halo/plugin/meilisearch/reconciler/MeiliSearchReconciler.java b/src/main/java/com/rs/halo/plugin/meilisearch/reconciler/MeiliSearchReconciler.java
@@ -3,6 +3,7 @@
 import static com.rs.halo.plugin.meilisearch.config.MeiliSearchSetting.DEFAULT_CROP_LENGTH;
 
 import com.rs.halo.plugin.meilisearch.config.MeiliSearchSetting;
+import com.rs.halo.plugin.meilisearch.utils.IndexHolder;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -19,6 +20,8 @@ public class MeiliSearchReconciler implements Reconciler<Reconciler.Request> {
 
     private final ReactiveSettingFetcher settingFetcher;
 
+    public static final String DEFAULT_EMPTY_STRING = "";
+
     @Override
     public Result reconcile(Request request) {
         String name = request.name();
@@ -33,9 +36,12 @@ private void loadPluginSetting() {
         settingFetcher.get("base")
             .doOnSuccess(baseSetting -> {
                 log.info("MeiliSearch setting update: {}", baseSetting);
-                MeiliSearchSetting.updateSetting(baseSetting.path("host").asText(""),
-                    baseSetting.path("masterKey").asText(""),
+                MeiliSearchSetting.updateSetting(
+                    baseSetting.path("host").asText(DEFAULT_EMPTY_STRING),
+                    baseSetting.path("masterKey").asText(DEFAULT_EMPTY_STRING),
                     baseSetting.path("cropLength").asInt(DEFAULT_CROP_LENGTH));
+                IndexHolder.resetIndex();
+                // todo update index document
             }).subscribe();
     }
 

diff --git a/src/main/java/com/rs/halo/plugin/meilisearch/service/MeiliSearchPostService.java b/src/main/java/com/rs/halo/plugin/meilisearch/service/MeiliSearchPostService.java
@@ -1,7 +1,9 @@
 package com.rs.halo.plugin.meilisearch.service;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.meilisearch.sdk.SearchRequest;
+import com.meilisearch.sdk.exceptions.MeilisearchException;
 import com.meilisearch.sdk.model.Searchable;
 import com.rs.halo.plugin.meilisearch.bean.Document;
 import com.rs.halo.plugin.meilisearch.config.MeiliSearchSetting;
@@ -59,11 +61,16 @@ public SearchResult<PostHit> search(SearchParam searchParam) throws Exception {
     }
 
     @Override
-    public void addDocuments(List<PostDoc> list) throws Exception {
-        log.info("add documents: {}", list.stream().map(PostDoc::title).toList());
-        IndexHolder.getIndex().addDocumentsInBatches(
-            objectMapper.writeValueAsString(Document.convertFromPostDocList(list)), list.size(),
-            "name");
+    public void addDocuments(List<PostDoc> list) {
+        List<String> documentsTitles = list.stream().map(PostDoc::title).toList();
+        log.info("add documents: {}", documentsTitles);
+        try {
+            IndexHolder.getIndex().addDocumentsInBatches(
+                objectMapper.writeValueAsString(Document.convertFromPostDocList(list)), list.size(),
+                "name");
+        } catch (MeilisearchException | JsonProcessingException e) {
+            log.error("add documents error, documents: {}", documentsTitles, e);
+        }
     }
 
     @Override