diff --git a/CHANGELOG.md b/CHANGELOG.md index dad6a07a..cf5fea7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,8 @@ ## flor 1.6.1 not yet released -* accept --djan to flotojson.rb +* Use djan in Flor.msg_to_detail_s(executor, message) +* Accept --djan to flotojson.rb ## flor 1.6.0 released 2023-01-13 diff --git a/lib/flor/log.rb b/lib/flor/log.rb index a8ebaa9a..c3472fdf 100644 --- a/lib/flor/log.rb +++ b/lib/flor/log.rb @@ -337,13 +337,18 @@ def msg_to_detail_s(executor, m, opts={}) o.puts "#{_c.rs}#{_c.dg}" o.puts "#{_c.dg}message:#{_c.yl}" - o.puts YAML.dump(m) + #o.puts YAML.dump(m) + o.puts(Flor.to_djan(m, indent: 2, width: true)) o.puts "#{_c.dg}tree:#{_c.yl}" o.puts(tree_to_s(node.lookup_tree(nid), nid, out: o)) if node o.puts "#{_c.dg}node:#{_c.yl}" - o.puts n ? YAML.dump(n.merge('tree' => '(above)')) : 'nil' + #o.puts n ? YAML.dump(n.merge('tree' => '(above)')) : 'nil' + o.puts( + n ? + Flor.to_djan(n.merge('tree' => '(above)'), indent: 2, width: true) : + 'nil') o.puts "#{_c.dg}nodes:#{_c.yl}" o.puts nods_to_s(executor, m, opts)