]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: Monitor: 'health detail --format=json' should only output JSON
authorDan Mick <dan.mick@inktank.com>
Thu, 11 Jul 2013 00:17:43 +0000 (17:17 -0700)
committerDan Mick <dan.mick@inktank.com>
Thu, 11 Jul 2013 03:58:50 +0000 (20:58 -0700)
Fixes: #5526
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
src/mon/Monitor.cc

index aafd2883e0a3dc49e5e8a891038f68074e5ea920..f64b6b1b318d26e1e16670d61d01055fbc078ea7 100644 (file)
@@ -1771,7 +1771,7 @@ void Monitor::get_health(string& status, bufferlist *detailbl, Formatter *f)
   while (!detail.empty()) {
     if (f)
       f->dump_string("item", detail.front().second);
-    if (detailbl != NULL) {
+    else if (detailbl != NULL) {
       detailbl->append(detail.front().second);
       detailbl->append('\n');
     }