From cbf8fc287262dcf36fc4b914db0aaf533449f8b0 Mon Sep 17 00:00:00 2001 From: autopp Date: Thu, 5 Jan 2017 18:29:10 +0900 Subject: [PATCH] port query parameter with_ivars to v0.12 --- lib/fluent/plugin/in_monitor_agent.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/fluent/plugin/in_monitor_agent.rb b/lib/fluent/plugin/in_monitor_agent.rb index dd05608c98..7a06657fa4 100644 --- a/lib/fluent/plugin/in_monitor_agent.rb +++ b/lib/fluent/plugin/in_monitor_agent.rb @@ -83,6 +83,10 @@ def build_object(req, res) opts[:pretty_json] = true end + if ivars = (qs['with_ivars'] || []).first + opts[:ivars] = ivars.split(',') + end + if with_config = get_search_parameter(qs, 'with_config'.freeze) opts[:with_config] = Fluent::Config.bool_value(with_config) end @@ -415,6 +419,13 @@ def get_monitor_info(pe, opts={}) } end obj['instance_variables'] = iv + elsif ivars = opts[:ivars] + iv = {} + ivars.each {|name| + iname = "@#{name}" + iv[name] = pe.instance_variable_get(iname) if pe.instance_variable_defined?(iname) + } + obj['instance_variables'] = iv end obj