]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
common/admin_socket: Adapted old protocol to use new protocol, simplifies handle...
authorAdam Kupczyk <akupczyk@redhat.com>
Tue, 30 Jul 2019 10:26:33 +0000 (12:26 +0200)
committerNeha Ojha <nojha@redhat.com>
Wed, 7 Aug 2019 19:54:33 +0000 (15:54 -0400)
Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 2b5da1f671a76f77107b6eaefc67e0e9c9179ca7)

src/common/admin_socket.cc

index 62c05ce5026b5a468170b95b9b46164c9651f462..1e935971f9107498ca4ec4f25191ae3e9f442b3f 100644 (file)
@@ -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));