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

- don't modify the load path anymore

Browse source
This commit is contained in:
Jordan Sissel 2013-07-02 10:28:00 -07:00
parent ed95a7a532
commit cee6ee3057
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/logstash/namespace.rb
View file

@ -1,4 +1,4 @@
$: << File.join(File.dirname(__FILE__), "..", "..", "vendor", "bundle")
#$: << File.join(File.dirname(__FILE__), "..", "..", "vendor", "bundle")
module LogStash
module Inputs; end

2
lib/logstash/runner.rb
View file

@ -57,7 +57,7 @@ class LogStash::Runner
@startup_interruption_trap = Stud::trap("INT") { puts "Interrupted"; exit 0 }
LogStash::Util::set_thread_name(self.class.name)
$LOAD_PATH << File.join(File.dirname(__FILE__), "..")
#$LOAD_PATH << File.join(File.dirname(__FILE__), "..")
if RUBY_VERSION < "1.9.2"
$stderr.puts "Ruby 1.9.2 or later is required. (You are running: " + RUBY_VERSION + ")"

4
lib/logstash/test.rb
View file

@ -2,8 +2,8 @@ require "rubygems"
require "optparse"
# TODO(sissel): Are these necessary anymore?
$:.unshift "#{File.dirname(__FILE__)}/../lib"
$:.unshift "#{File.dirname(__FILE__)}/../test"
#$:.unshift "#{File.dirname(__FILE__)}/../lib"
#$:.unshift "#{File.dirname(__FILE__)}/../test"
require "logstash/namespace"
require "logstash/loadlibs"