]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/status: output to stdout, not stderr 22089/head
authorJohn Spray <john.spray@redhat.com>
Fri, 18 May 2018 15:44:34 +0000 (16:44 +0100)
committerJohn Spray <john.spray@redhat.com>
Fri, 18 May 2018 15:45:34 +0000 (16:45 +0100)
I think this was just me forgetting the order
of the arguments when writing the return statements.

Fixes: http://tracker.ceph.com/issues/24175
Signed-off-by: John Spray <john.spray@redhat.com>
src/pybind/mgr/status/module.py

index 51756257025634448092e6ecd08d823a51b7d853..b4a0f25e0af70db7447cbee7b9d113573f323ba6 100644 (file)
@@ -249,7 +249,7 @@ class Module(MgrModule):
                 ])
             output += version_table.get_string() + "\n"
 
-        return 0, "", output
+        return 0, output, ""
 
     def handle_osd_status(self, cmd):
         osd_table = PrettyTable(['id', 'host', 'used', 'avail', 'wr ops', 'wr data', 'rd ops', 'rd data', 'state'])
@@ -301,7 +301,7 @@ class Module(MgrModule):
                                ','.join(osd['state']),
                                ])
 
-        return 0, "", osd_table.get_string()
+        return 0, osd_table.get_string(), ""
 
     def handle_command(self, cmd):
         self.log.error("handle_command")