瀏覽代碼

Rename confusing variable holding name of Logstash index template (#36840)

The previous name was confusing, so this commit clarifies it.
Gordon Brown 6 年之前
父節點
當前提交
f99975bc29
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/Logstash.java

+ 2 - 2
x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/Logstash.java

@@ -29,7 +29,7 @@ import java.util.regex.Pattern;
 public class Logstash extends Plugin implements ActionPlugin {
 public class Logstash extends Plugin implements ActionPlugin {
 
 
     private static final String LOGSTASH_TEMPLATE_FILE_NAME = "logstash-management";
     private static final String LOGSTASH_TEMPLATE_FILE_NAME = "logstash-management";
-    private static final String LOGSTASH_INDEX_NAME = ".logstash-management";
+    private static final String LOGSTASH_INDEX_TEMPLATE_NAME = ".logstash-management";
     private static final String OLD_LOGSTASH_INDEX_NAME = "logstash-index-template";
     private static final String OLD_LOGSTASH_INDEX_NAME = "logstash-index-template";
     private static final String TEMPLATE_VERSION_PATTERN =
     private static final String TEMPLATE_VERSION_PATTERN =
             Pattern.quote("${logstash.template.version}");
             Pattern.quote("${logstash.template.version}");
@@ -61,7 +61,7 @@ public class Logstash extends Plugin implements ActionPlugin {
     public UnaryOperator<Map<String, IndexTemplateMetaData>> getIndexTemplateMetaDataUpgrader() {
     public UnaryOperator<Map<String, IndexTemplateMetaData>> getIndexTemplateMetaDataUpgrader() {
         return templates -> {
         return templates -> {
             templates.keySet().removeIf(OLD_LOGSTASH_INDEX_NAME::equals);
             templates.keySet().removeIf(OLD_LOGSTASH_INDEX_NAME::equals);
-            TemplateUtils.loadTemplateIntoMap("/" + LOGSTASH_TEMPLATE_FILE_NAME + ".json", templates, LOGSTASH_INDEX_NAME,
+            TemplateUtils.loadTemplateIntoMap("/" + LOGSTASH_TEMPLATE_FILE_NAME + ".json", templates, LOGSTASH_INDEX_TEMPLATE_NAME,
                     Version.CURRENT.toString(), TEMPLATE_VERSION_PATTERN, LogManager.getLogger(Logstash.class));
                     Version.CURRENT.toString(), TEMPLATE_VERSION_PATTERN, LogManager.getLogger(Logstash.class));
             return templates;
             return templates;
         };
         };