RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-16 08:26:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

mon: OSDMonitor: don't output to stdout in plain text if json is specified

Browse Source 
Fixes: #3748

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Joao Eduardo Luis 2013-01-10 18:54:12 +00:00 committed by Sage Weil
parent 7ea5d84fa3
commit 410906e049
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mon/OSDMonitor.cc
View File

@ -1753,7 +1753,8 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
}
if (r == 0) {
rdata.append(ds);
ss << "dumped osdmap epoch " << p->get_epoch();
if (format != "json")
ss << " ";
}
} else if (cmd == "ls") {
stringstream ds;