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

setup bundler env when no .bundle/config

Browse source 
Fixes #2671
This commit is contained in:
Colin Surprenant 2015-02-23 18:46:08 -05:00 • committed by Jordan Sissel
parent c1ea865893
commit 2291498162
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/logstash/environment.rb
View file

@ -44,6 +44,7 @@ module LogStash
ELASTICSEARCH_DIR = ::File.join(LOGSTASH_HOME, "vendor", "elasticsearch") ELASTICSEARCH_DIR = ::File.join(LOGSTASH_HOME, "vendor", "elasticsearch")
BUNDLE_DIR = ::File.join(LOGSTASH_HOME, "vendor", "bundle") BUNDLE_DIR = ::File.join(LOGSTASH_HOME, "vendor", "bundle")
GEMFILE_PATH = ::File.join(LOGSTASH_HOME, "Gemfile") GEMFILE_PATH = ::File.join(LOGSTASH_HOME, "Gemfile")
BUNDLE_CONFIG_PATH = ::File.join(LOGSTASH_HOME, ".bundle", "config")
BOOTSTRAP_GEM_PATH = ::File.join(LOGSTASH_HOME, 'build', 'bootstrap') BOOTSTRAP_GEM_PATH = ::File.join(LOGSTASH_HOME, 'build', 'bootstrap')
LOGSTASH_ENV = (ENV["LS_ENV"] || 'production').to_s.freeze LOGSTASH_ENV = (ENV["LS_ENV"] || 'production').to_s.freeze
@ -86,6 +87,13 @@ module LogStash
end end
def bundler_setup! def bundler_setup!
# if there's no .bundle/config setup the runtime environment.
unless File.exists?(BUNDLE_CONFIG_PATH)
ENV["BUNDLE_PATH"] = LogStash::Environment::BUNDLE_DIR
ENV["BUNDLE_GEMFILE"] = LogStash::Environment::GEMFILE_PATH
ENV["BUNDLE_WITHOUT"] = "development"
end
begin begin
require "bundler" require "bundler"
rescue LoadError rescue LoadError