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

Update after review

Browse source 
Fixes #2029
This commit is contained in:
Richard Pijnenburg 2014-11-05 23:51:39 +00:00 • committed by Jordan Sissel
parent 4f46ab33cc
commit 1381c06858
3 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/logstash/pluginmanager/install.rb
View file

@ -53,7 +53,7 @@ class LogStash::PluginManager::Install < Clamp::Command
end
::Gem.configuration.verbose = false
LogStash::PluginManager::Vendor.new().setup_hook
LogStash::PluginManager::Vendor.setup_hook
options = {}
options[:document] = []
inst = Gem::DependencyInstaller.new(options)

2
lib/logstash/pluginmanager/update.rb
View file

@ -63,7 +63,7 @@ class LogStash::PluginManager::Update < Clamp::Command
end
::Gem.configuration.verbose = false
LogStash::PluginManager::Vendor.new().setup_hook
LogStash::PluginManager::Vendor.setup_hook
options = {}
options[:document] = []
inst = Gem::DependencyInstaller.new(options)

17
lib/logstash/pluginmanager/vendor.rb
View file

@ -1,17 +1,16 @@
require 'logstash/json'
require 'logstash/util/filetools'
class LogStash::PluginManager::Vendor
module LogStash::PluginManager::Vendor
def setup_hook
def self.setup_hook
Gem.post_install do |gem_installer|
unless ENV['VENDOR_SKIP'] == 'true'
vendor_file = ::File.join(gem_installer.gem_dir, 'vendor.json')
if ::File.exist?(vendor_file)
vendor_file_content = IO.read(vendor_file)
file_list = LogStash::Json.load(vendor_file_content)
LogStash::Util::FileTools.process_downloads(file_list, ::File.join(gem_installer.gem_dir, 'vendor'))
end
next if ENV['VENDOR_SKIP'] == 'true'
vendor_file = ::File.join(gem_installer.gem_dir, 'vendor.json')
if ::File.exist?(vendor_file)
vendor_file_content = IO.read(vendor_file)
file_list = LogStash::Json.load(vendor_file_content)
LogStash::Util::FileTools.process_downloads(file_list, ::File.join(gem_installer.gem_dir, 'vendor'))
end
end
end