From 6e01395dde7cb59551829de85f3d90daa35626a3 Mon Sep 17 00:00:00 2001 From: Tal Levy Date: Thu, 10 Nov 2016 13:47:08 -0800 Subject: [PATCH] add logstash-core resources to classpath during development Fixes #6235. Fixes #6237 --- logstash-core/lib/logstash-core/logstash-core.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/logstash-core/lib/logstash-core/logstash-core.rb b/logstash-core/lib/logstash-core/logstash-core.rb index 1d39ad9e8..8c452b0d2 100644 --- a/logstash-core/lib/logstash-core/logstash-core.rb +++ b/logstash-core/lib/logstash-core/logstash-core.rb @@ -9,10 +9,12 @@ require "logstash-core_jars" # local dev setup classes_dir = File.expand_path("../../../build/classes/main", __FILE__) +resources_dir = File.expand_path("../../../build/resources/main", __FILE__) -if File.directory?(classes_dir) +if File.directory?(classes_dir) && File.directory?(resources_dir) # if in local dev setup, add target to classpath $CLASSPATH << classes_dir unless $CLASSPATH.include?(classes_dir) + $CLASSPATH << resources_dir unless $CLASSPATH.include?(resources_dir) else # otherwise use included jar begin