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

Remove constant redefinition

Browse source 
The Rack config was redefining a constant in the configuration, since
this value isn't used anywhere else there was no need to use a constant.

The conflicting ROOT contants was defined in `lib/logstash/patches/profile_require_calls.rb`

Fixes: #5163

Fixes #5208
This commit is contained in:
Pier-Hugues Pellerin 2016-04-26 20:48:34 -04:00
parent 3e4cb0e20e
commit f73cff65f0
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
logstash-core/lib/logstash/api/init.ru
View file

@ -1,6 +1,6 @@
ROOT = File.expand_path(File.dirname(__FILE__))
$LOAD_PATH.unshift File.join(ROOT, 'lib')
Dir.glob('lib/**').each{ |d| $LOAD_PATH.unshift(File.join(ROOT, d)) }
api_root = File.expand_path(File.dirname(__FILE__))
$LOAD_PATH.unshift File.join(api_root, 'lib')
Dir.glob('lib/**').each{ |d| $LOAD_PATH.unshift(File.join(api_root, d)) }
require 'sinatra'
require 'app/root'