]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr: add generic Formatter for handle_command
authorSage Weil <sage@redhat.com>
Fri, 24 Feb 2017 19:38:47 +0000 (14:38 -0500)
committerSage Weil <sage@redhat.com>
Wed, 29 Mar 2017 15:38:31 +0000 (11:38 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
src/mgr/DaemonServer.cc

index 919082f78c97f3ceb2d3641c5b65bd7c6a1dd37b..88476cac79fa2209362f5dee9bf8fb4956b0db30 100644 (file)
@@ -243,12 +243,19 @@ bool DaemonServer::handle_command(MCommand *m)
   // block a messenger thread on python code.
 
   ConnectionRef con = m->get_connection();
+  string format;
+  boost::scoped_ptr<Formatter> f;
 
   if (!cmdmap_from_json(m->cmd, &cmdmap, ss)) {
     r = -EINVAL;
     goto out;
   }
 
+  {
+    cmd_getval(g_ceph_context, cmdmap, "format", format, string("plain"));
+    f.reset(Formatter::create(format));
+  }
+
   dout(4) << "decoded " << cmdmap.size() << dendl;
   cmd_getval(cct, cmdmap, "prefix", prefix);