Skip to content

Commit 17afe66

Browse files
kenhysdaipom
andauthored
config: change inspect format (#4914)
**Which issue(s) this PR fixes**: Fixes # **What this PR does / why we need it**: In the previous versions, it is hard to identify the separator of elements. Added attr: and elements: prefix for properties and mark it <...>. Before: ``` name:ROOT, arg:, {}, [name:system, arg:, {"config_include_dir"=>"..."}, [], name:source, arg:, {"@type"=>"forward"}, [], name:source, arg:, {"@type"=>"tcp"}, []] ``` After: ``` <name:ROOT, arg:, attrs:{}, elements:[<name:system, arg:, attrs:{"config_include_dir"=>"..."}, elements:[]>, <name:source, arg:, attrs:{"@type"=>"forward"}, []>, <name:source, arg:, atrrs:{"@type"=>"tcp"}, elements:[]>] ``` **Docs Changes**: N/A **Release Note**: --------- Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com> Co-authored-by: Daijiro Fukuda <fukuda@clear-code.com>
1 parent 86a95d5 commit 17afe66

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

lib/fluent/config/element.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def add_element(name, arg = '')
7373

7474
def inspect
7575
attrs = super
76-
"name:#{@name}, arg:#{@arg}, " + attrs + ", " + @elements.inspect
76+
"<name:#{@name}, arg:#{@arg}, attrs:#{attrs}, elements:#{@elements.inspect}>"
7777
end
7878

7979
# Used by PP and Pry

test/config/test_element.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ def element(name = 'ROOT', arg = '', attrs = {}, elements = [], unused = nil)
280280
element('test', 'ext', {'k2' => 'v2'}, [])
281281
])
282282
dump = <<-CONF
283-
name:ROOT, arg:, {\"k1\"=>\"v1\"}, [name:test, arg:ext, {\"k2\"=>\"v2\"}, []]
283+
<name:ROOT, arg:, attrs:{\"k1\"=>\"v1\"}, elements:[<name:test, arg:ext, attrs:{\"k2\"=>\"v2\"}, elements:[]>]>
284284
CONF
285285
assert_not_equal(e.to_s, e.inspect.gsub(' => ', '=>'))
286286
assert_equal(dump.chomp, e.inspect.gsub(' => ', '=>'))

0 commit comments

Comments
 (0)