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

Move the global method register_local_modules to a Ruby Module (#7555)

Browse source 
Now in LogStash::Modules::Util, this allows it to be used where modules
are defined in external gems like logastash-x-pack.
This commit is contained in:
Guy Boertje 2017-06-28 19:31:55 +01:00 • committed by GitHub
parent b06767b71e
commit 3cbd3d0d40
2 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
logstash-core/lib/logstash/modules/util.rb Normal file
View file

@ -0,0 +1,17 @@
# encoding: utf-8
require_relative "scaffold"
# This module function should be used when gems or
# x-pack defines modules in their folder structures.
module LogStash module Modules module Util
def self.register_local_modules(path)
modules_path = ::File.join(path, ::File::Separator, "modules")
::Dir.foreach(modules_path) do |item|
# Ignore unix relative path ids
next if item == '.' or item == '..'
# Ignore non-directories
next if !::File.directory?(::File.join(modules_path, ::File::Separator, item))
LogStash::PLUGIN_REGISTRY.add(:modules, item, Scaffold.new(item, ::File.join(modules_path, ::File::Separator, item, ::File::Separator, "configuration")))
end
end
end end end

14
logstash-core/lib/logstash/runner.rb
View file

@ -20,6 +20,7 @@ require "logstash/patches/clamp"
require "logstash/settings"
require "logstash/version"
require "logstash/plugins/registry"
require "logstash/modules/util"
require "logstash/bootstrap_check/default_config"
require "logstash/bootstrap_check/bad_java"
require "logstash/bootstrap_check/bad_ruby"
@ -27,17 +28,6 @@ require "set"
java_import 'org.logstash.FileLockFactory'
def register_local_modules(path)
modules_path = File.join(path, File::Separator, "modules")
Dir.foreach(modules_path) do |item|
# Ignore unix relative path ids
next if item == '.' or item == '..'
# Ignore non-directories
next if !File.directory?(File.join(modules_path, File::Separator, item))
LogStash::PLUGIN_REGISTRY.add(:modules, item, LogStash::Modules::Scaffold.new(item, File.join(modules_path, File::Separator, item, File::Separator, "configuration")))
end
end
class LogStash::Runner < Clamp::StrictCommand
include LogStash::Util::Loggable
# The `path.settings` and `path.logs` need to be defined in the runner instead of the `logstash-core/lib/logstash/environment.rb`
@ -262,7 +252,7 @@ class LogStash::Runner < Clamp::StrictCommand
end
# Add local modules to the registry before everything else
register_local_modules(LogStash::Environment::LOGSTASH_HOME)
LogStash::Modules::Util.register_local_modules(LogStash::Environment::LOGSTASH_HOME)
# We configure the registry and load any plugin that can register hooks
# with logstash, this need to be done before any operation.