]> 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)
committerNathan Cutler <ncutler@suse.com>
Wed, 28 Aug 2019 11:07:58 +0000 (13:07 +0200)
Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 2b5da1f671a76f77107b6eaefc67e0e9c9179ca7)

src/common/admin_socket.cc

index c7f21f7b0f206c4b73b2d8abfc4e619c311f0bb4..258eb7315a617e49abb58d13e9b62081c647f586 100644 (file)
@@ -317,6 +317,8 @@ bool AdminSocket::do_accept()
          c = "foo";
          break;
        }
+       //wrap command with new protocol
+       c = "{\"prefix\": \"" + c + "\"}";
        break;
       }
     } else {
@@ -340,7 +342,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;
     retry_sys_call(::close, connection_fd);