From: Sage Weil <sage@redhat.com>
Date: Fri, 24 Feb 2017 19:38:47 +0000 (-0500)
Subject: mgr: add generic Formatter for handle_command
X-Git-Tag: v12.0.2~252^2~69
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3faec244ca1d5642d8dad5646050687a4a006ffc;p=ceph.git

mgr: add generic Formatter for handle_command

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index 919082f78c97..88476cac79fa 100644
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -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);