From: Dan Mick <dan.mick@redhat.com>
Date: Wed, 12 Apr 2017 02:13:29 +0000 (-0700)
Subject: mgr/MgrPyModule::handle_command: order stringstreams to match intent
X-Git-Tag: v12.0.3~290^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8c249e4b2b2228a1d24638199a9380acaac77de1;p=ceph.git

mgr/MgrPyModule::handle_command: order stringstreams to match intent

ds is intended for command output (like stdout), to be shown/saved
when there's no error returned; ss is for error status (like stderr)
to further explain the error.  mgr Python tracebacks should go to
the latter.

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/src/mgr/MgrPyModule.cc b/src/mgr/MgrPyModule.cc
index 6337fd9b35d0..35b28f733108 100644
--- a/src/mgr/MgrPyModule.cc
+++ b/src/mgr/MgrPyModule.cc
@@ -219,8 +219,8 @@ int MgrPyModule::load_commands()
 
 int MgrPyModule::handle_command(
   const cmdmap_t &cmdmap,
-  std::stringstream *ss,
-  std::stringstream *ds)
+  std::stringstream *ds,
+  std::stringstream *ss)
 {
   assert(ss != nullptr);
   assert(ds != nullptr);
diff --git a/src/mgr/MgrPyModule.h b/src/mgr/MgrPyModule.h
index 0588401a787f..9d50a1b44105 100644
--- a/src/mgr/MgrPyModule.h
+++ b/src/mgr/MgrPyModule.h
@@ -73,8 +73,8 @@ public:
 
   int handle_command(
     const cmdmap_t &cmdmap,
-    std::stringstream *ss,
-    std::stringstream *ds);
+    std::stringstream *ds,
+    std::stringstream *ss);
 };
 
 #endif