diff --git a/logstash-core/spec/logstash/pipeline_action/reload_spec.rb b/logstash-core/spec/logstash/pipeline_action/reload_spec.rb index 0ce5ec0f5d6..5e0f9e171fd 100644 --- a/logstash-core/spec/logstash/pipeline_action/reload_spec.rb +++ b/logstash-core/spec/logstash/pipeline_action/reload_spec.rb @@ -60,7 +60,7 @@ it "run the new pipeline code" do subject.execute(agent, pipelines) - expect(pipelines.get_pipeline(pipeline_id).config_hash).to eq(new_pipeline_config.config_hash) + expect(pipelines.get_pipeline(pipeline_id).pipeline_config.config_hash).to eq(new_pipeline_config.config_hash) end end diff --git a/logstash-core/src/main/java/org/logstash/execution/AbstractPipelineExt.java b/logstash-core/src/main/java/org/logstash/execution/AbstractPipelineExt.java index a0c4488b779..ec26b9b0735 100644 --- a/logstash-core/src/main/java/org/logstash/execution/AbstractPipelineExt.java +++ b/logstash-core/src/main/java/org/logstash/execution/AbstractPipelineExt.java @@ -26,7 +26,6 @@ import java.nio.file.FileStore; import java.nio.file.Files; import java.nio.file.Paths; -import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.time.temporal.ChronoUnit; import java.time.temporal.TemporalUnit; @@ -48,7 +47,6 @@ import java.util.stream.Stream; import com.google.common.annotations.VisibleForTesting; -import org.apache.commons.codec.binary.Hex; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jruby.Ruby; @@ -146,8 +144,6 @@ public class AbstractPipelineExt extends RubyBasicObject { @SuppressWarnings({"rawtypes", "serial"}) private List configParts; - private RubyString configHash; - private transient IRubyObject settings; private transient IRubyObject pipelineSettings; @@ -263,11 +259,6 @@ private AbstractPipelineExt initialize(final ThreadContext context, pipelineSettings = pipelineConfig; configString = (RubyString) pipelineSettings.callMethod(context, "config_string"); configParts = pipelineSettings.toJava(PipelineConfig.class).getConfigParts(); - configHash = context.runtime.newString( - Hex.encodeHexString( - MessageDigest.getInstance("SHA1").digest(configString.getBytes()) - ) - ); settings = pipelineSettings.callMethod(context, "settings"); final IRubyObject id = getSetting(context, SettingKeyDefinitions.PIPELINE_ID); if (id.isNil()) { @@ -356,11 +347,6 @@ public final RubyString configStr() { return configString; } - @JRubyMethod(name = "config_hash") - public final RubyString configHash() { - return configHash; - } - @JRubyMethod(name = "ephemeral_id") public final RubyString ephemeralId() { return ephemeralId;