Fix the wrong use of setting fetcher in reactive non-blocking thread

Signed-off-by: JohnNiang <[email protected]>
halo-sigs · Jun 28, 2024 · de40c92 · de40c92
1 parent 94e34d1
commit de40c92
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/main/java/run/halo/umami/UmamiTrackerProcessor.java b/src/main/java/run/halo/umami/UmamiTrackerProcessor.java
@@ -7,27 +7,27 @@
 import org.thymeleaf.model.IModelFactory;
 import org.thymeleaf.processor.element.IElementModelStructureHandler;
 import reactor.core.publisher.Mono;
-import run.halo.app.plugin.SettingFetcher;
+import run.halo.app.plugin.ReactiveSettingFetcher;
 import run.halo.app.theme.dialect.TemplateHeadProcessor;
 
 @Component
 public class UmamiTrackerProcessor implements TemplateHeadProcessor {
 
-    private final SettingFetcher settingFetcher;
+    private final ReactiveSettingFetcher settingFetcher;
 
-    public UmamiTrackerProcessor(SettingFetcher settingFetcher) {
+    public UmamiTrackerProcessor(ReactiveSettingFetcher settingFetcher) {
         this.settingFetcher = settingFetcher;
     }
 
     @Override
     public Mono<Void> process(ITemplateContext context, IModel model,
                               IElementModelStructureHandler structureHandler) {
         return settingFetcher.fetch("basic", BasicConfig.class)
-                .map(basicConfig -> {
+                .doOnNext(basicConfig -> {
                     final IModelFactory modelFactory = context.getModelFactory();
                     model.add(modelFactory.createText(trackerScript(basicConfig.getWebsiteId(), basicConfig.endpoint, basicConfig.scriptName)));
-                    return Mono.empty();
-                }).orElse(Mono.empty()).then();
+                })
+                .then();
     }
 
     private String trackerScript(String websiteId, String endpoint, String scriptName) {