mon, osd: Clean up "flush(stringstream)" continued

Missing files in last commit; sorry!

Signed-off-by: Dan Mick <dan.mick@inktank.com>

diff --git a/src/common/cmdparse.cc b/src/common/cmdparse.cc
index 370591cb3bb31cc2b0b01d54b2a5e557653501a9..16c62349c403c2be91ce1918cd85d7fe8a4852d6 100644 (file)
--- a/src/common/cmdparse.cc
+++ b/src/common/cmdparse.cc
@@ -27,7 +27,7 @@ using namespace std;
  */
 
 void
-dump_cmd_to_json(JSONFormatter *f, const string& cmd)
+dump_cmd_to_json(Formatter *f, const string& cmd)
 {
   // put whole command signature in an already-opened container
   // elements are: "name", meaning "the typeless name that means a literal"
@@ -77,7 +77,7 @@ dump_cmd_to_json(JSONFormatter *f, const string& cmd)
 }
 
 void
-dump_cmd_and_help_to_json(JSONFormatter *jf,
+dump_cmd_and_help_to_json(Formatter *jf,
                          const string& secname,
                          const string& cmdsig,
                          const string& helptext)
@@ -91,7 +91,7 @@ dump_cmd_and_help_to_json(JSONFormatter *jf,
 }
 
 void
-dump_cmddesc_to_json(JSONFormatter *jf,
+dump_cmddesc_to_json(Formatter *jf,
                     const string& secname,
                     const string& cmdsig,
                     const string& helptext,

diff --git a/src/common/cmdparse.h b/src/common/cmdparse.h
index 58c66b46052d133e3a8415e180e48d19a2afddda..10e43ab0abe66f771fd53fd01ce2f7ad4dd765c6 100644 (file)
--- a/src/common/cmdparse.h
+++ b/src/common/cmdparse.h
@@ -20,12 +20,12 @@ class CephContext;
 typedef boost::variant<std::string, bool, int64_t, double, std::vector<std::string> > cmd_vartype;
 typedef std::map<std::string, cmd_vartype> cmdmap_t;
 
-void dump_cmd_to_json(ceph::JSONFormatter *f, const std::string& cmd);
-void dump_cmd_and_help_to_json(ceph::JSONFormatter *f,
+void dump_cmd_to_json(ceph::Formatter *f, const std::string& cmd);
+void dump_cmd_and_help_to_json(ceph::Formatter *f,
                               const std::string& secname,
                               const std::string& cmd,
                               const std::string& helptext);
-void dump_cmddesc_to_json(JSONFormatter *jf,
+void dump_cmddesc_to_json(ceph::Formatter *jf,
                          const std::string& secname,
                          const std::string& cmdsig,
                          const std::string& helptext,

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index b55aff0a19031d9694b8e5ac7b9c8cdb082da920..a9d3e48a3bea87a4509facaac3abc3243fad8090 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1937,7 +1937,7 @@ void Monitor::handle_command(MMonCommand *m)
   cmd_getval(g_ceph_context, cmdmap, "prefix", prefix);
   if (prefix == "get_command_descriptions") {
     int cmdnum = 0;
-    JSONFormatter *f = new JSONFormatter();
+    Formatter *f = new_formatter("json");
     f->open_object_section("command_descriptions");
     for (MonCommand *cp = mon_commands;
         cp < &mon_commands[ARRAY_SIZE(mon_commands)]; cp++) {