YUKI Hiroshi
null+****@clear*****
Thu Feb 13 15:54:11 JST 2014
YUKI Hiroshi 2014-02-13 15:54:11 +0900 (Thu, 13 Feb 2014) New Revision: a69f58936db1a7d8f6f05b65344a2c00a3bd9f56 https://github.com/droonga/fluent-plugin-droonga/commit/a69f58936db1a7d8f6f05b65344a2c00a3bd9f56 Message: Indent Modified files: lib/droonga/plugin_loader.rb Modified: lib/droonga/plugin_loader.rb (+19 -19) =================================================================== --- lib/droonga/plugin_loader.rb 2014-02-13 15:52:39 +0900 (48a5c58) +++ lib/droonga/plugin_loader.rb 2014-02-13 15:54:11 +0900 (e9070e9) @@ -24,28 +24,28 @@ module Droonga loaded = [] loading = nil begin - $LOAD_PATH.each do |load_path| - Dir.glob("#{load_path}/droonga/plugin/*") do |type_path| - next unless File.directory?(type_path) - type = File.basename(type_path) - Dir.glob("#{type_path}/*.rb") do |path| - loading = path - name = File.basename(path, ".rb") - loader = new(type, name) - loader.load - loaded << path + $LOAD_PATH.each do |load_path| + Dir.glob("#{load_path}/droonga/plugin/*") do |type_path| + next unless File.directory?(type_path) + type = File.basename(type_path) + Dir.glob("#{type_path}/*.rb") do |path| + loading = path + name = File.basename(path, ".rb") + loader = new(type, name) + loader.load + loaded << path + end end - end - Pathname.glob("#{load_path}/droonga/plugins/*.rb") do |plugin_path| - loading = plugin_path - relative_plugin_path = - plugin_path.relative_path_from(Pathname(load_path)) - require_path = relative_plugin_path.to_s.gsub(/\.rb\z/, "") - require require_path - loaded << plugin_path + Pathname.glob("#{load_path}/droonga/plugins/*.rb") do |plugin_path| + loading = plugin_path + relative_plugin_path = + plugin_path.relative_path_from(Pathname(load_path)) + require_path = relative_plugin_path.to_s.gsub(/\.rb\z/, "") + require require_path + loaded << plugin_path + end end - end rescue StandardError, SyntaxError => error $log.info("#{self.name}: loaded plugins:\n#{loaded.join("\n")}") $log.error("#{self.name}: failed to load: #{loading}") -------------- next part -------------- HTML����������������������������...Download