From: Adam Kupczyk <akupczyk@redhat.com>
Date: Tue, 30 Jul 2019 10:26:33 +0000 (+0200)
Subject: common/admin_socket: Adapted old protocol to use new protocol, simplifies handle... 
X-Git-Tag: v12.2.13~157^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4a02a749d10a01a36ff2f4e07df511064c926969;p=ceph.git

common/admin_socket: Adapted old protocol to use new protocol, simplifies handle path.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 2b5da1f671a76f77107b6eaefc67e0e9c9179ca7)
---

diff --git a/src/common/admin_socket.cc b/src/common/admin_socket.cc
index 62c05ce5026..1e935971f91 100644
--- a/src/common/admin_socket.cc
+++ b/src/common/admin_socket.cc
@@ -333,6 +333,8 @@ bool AdminSocket::do_accept()
 	  c = "foo";
 	  break;
 	}
+	//wrap command with new protocol
+	c = "{\"prefix\": \"" + c + "\"}";
 	break;
       }
     } else {
@@ -356,7 +358,7 @@ bool AdminSocket::do_accept()
   string format;
   vector<string> cmdvec;
   stringstream errss;
-  cmdvec.push_back(cmd);
+  cmdvec.push_back(c);
   if (!cmdmap_from_json(cmdvec, &cmdmap, errss)) {
     ldout(m_cct, 0) << "AdminSocket: " << errss.str() << dendl;
     VOID_TEMP_FAILURE_RETRY(close(connection_fd));