Kaynağa Gözat

优化内嵌es日志

zhouhao 5 yıl önce
ebeveyn
işleme
54d4e7296c

+ 13 - 6
jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/configuration/ElasticSearchConfiguration.java

@@ -26,17 +26,24 @@ import org.springframework.context.annotation.Configuration;
     ElasticSearchIndexProperties.class})
 public class ElasticSearchConfiguration {
 
-    @Autowired
-    private ElasticSearchProperties properties;
+    private final ElasticSearchProperties properties;
 
-    @Autowired
-    private EmbeddedElasticSearchProperties embeddedElasticSearchProperties;
+    private final EmbeddedElasticSearchProperties embeddedProperties;
+
+    public ElasticSearchConfiguration(ElasticSearchProperties properties, EmbeddedElasticSearchProperties embeddedProperties) {
+        this.properties = properties;
+        this.embeddedProperties = embeddedProperties;
+    }
 
     @Bean
     @SneakyThrows
     public ElasticRestClient elasticRestClient() {
-        if (embeddedElasticSearchProperties.isEnabled()) {
-            new EmbeddedElasticSearch(embeddedElasticSearchProperties)
+        if (embeddedProperties.isEnabled()) {
+            log.debug("starting embedded elasticsearch on {}:{}",
+                embeddedProperties.getHost(),
+                embeddedProperties.getPort());
+
+            new EmbeddedElasticSearch(embeddedProperties)
                 .start();
         }
         RestHighLevelClient client = new RestHighLevelClient(RestClient.builder(properties.createHosts())

+ 2 - 10
jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/embedded/EmbeddedElasticSearch.java

@@ -1,6 +1,7 @@
 package org.jetlinks.community.elastic.search.embedded;
 
 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.node.InternalSettingsPreparer;
 import org.elasticsearch.node.Node;
@@ -8,6 +9,7 @@ import org.elasticsearch.transport.Netty4Plugin;
 
 import java.util.Collections;
 
+@Slf4j
 public class EmbeddedElasticSearch extends Node {
 
     static {
@@ -33,14 +35,4 @@ public class EmbeddedElasticSearch extends Node {
 
     }
 
-    @SneakyThrows
-    public void doStart() {
-        start();
-    }
-
-    @SneakyThrows
-    public void shutdown() {
-        close();
-    }
-
 }