From 49a5e775aa92a8218bb659909de20637d5aa660a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 5 Jan 2018 13:45:02 -0600 Subject: [PATCH] common/options: fix dump() By convention dump() does not include the containing object section. Signed-off-by: Sage Weil --- src/common/ceph_context.cc | 4 ++-- src/common/options.cc | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc index 582788da4c4e4..4a342b5bb4b69 100644 --- a/src/common/ceph_context.cc +++ b/src/common/ceph_context.cc @@ -480,13 +480,13 @@ void CephContext::do_command(std::string_view command, const cmdmap_t& cmdmap, msg << "Setting not found: '" << key << "'"; f->dump_string("error", msg.str()); } else { - i->second.dump(f); + f->dump_object("option", i->second); } } else { // Output all f->open_array_section("options"); for (const auto &option : ceph_options) { - option.dump(f); + f->dump_object("option", option); } f->close_section(); } diff --git a/src/common/options.cc b/src/common/options.cc index 6628ca5b7eba1..7aef433816608 100644 --- a/src/common/options.cc +++ b/src/common/options.cc @@ -159,7 +159,6 @@ int Option::parse_value( void Option::dump(Formatter *f) const { - f->open_object_section("option"); f->dump_string("name", name); f->dump_string("type", type_to_str(type)); @@ -200,8 +199,6 @@ void Option::dump(Formatter *f) const dump_value("min", min, f); dump_value("max", max, f); - - f->close_section(); } ostream& operator<<(ostream& out, const Option::value_t& v) -- 2.39.5