github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 06:37:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix path for local development (attempt 2)

Browse source 
With IntelliJ 2017.02 the gradle output changed from 'build/classes' to 'out/production/classes'. See https://youtrack.jetbrains.com/issue/IDEA-175172 for additional information.

This PR changes the local developement behavior to prefer the classes build with IntelliJ (if they exist) over the classes built directly with gradle.

Fixes #8056
This commit is contained in:
Jake Landis 2017-08-23 09:12:53 -05:00
parent 9449b1909a
commit b7fef5d837
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
logstash-core/lib/logstash-core/logstash-core.rb
View file

@ -8,8 +8,16 @@ end
require "logstash-core_jars"
# local dev setup
classes_dir = File.expand_path("../../../build/classes/java/main", __FILE__)
resources_dir = File.expand_path("../../../build/resources/main", __FILE__)
alt_classdir = File.expand_path("../../../out/production/classes", __FILE__) #IntelliJ's gradle output as of 2017.02 https://youtrack.jetbrains.com/issue/IDEA-175172
if File.directory?(alt_classdir)
classes_dir = alt_classdir
resources_dir = File.expand_path("../../../out/production/resources", __FILE__)
else
classes_dir = File.expand_path("../../../build/classes/java/main", __FILE__)
resources_dir = File.expand_path("../../../build/resources/main", __FILE__)
end
if File.directory?(classes_dir) && File.directory?(resources_dir)
# if in local dev setup, add target to classpath