From: Sage Weil <sage.weil@dreamhost.com>
Date: Fri, 30 Mar 2012 04:31:20 +0000 (-0700)
Subject: ceph: --concise by default, add --verbose option
X-Git-Tag: v0.45~39
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=424b5b071eedfd7d5a9191fef027dbbba217f1ff;p=ceph.git

ceph: --concise by default, add --verbose option

It's time.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---

diff --git a/src/tools/ceph.cc b/src/tools/ceph.cc
index e01539d5a046..99adc20a9ecd 100644
--- a/src/tools/ceph.cc
+++ b/src/tools/ceph.cc
@@ -80,6 +80,8 @@ static void parse_cmd_args(vector<const char*> &args,
       *mode = CEPH_TOOL_MODE_OBSERVER;
     } else if (ceph_argparse_flag(args, i, "--concise", (char*)NULL)) {
       *concise = true;
+    } else if (ceph_argparse_flag(args, i, "--verbose", (char*)NULL)) {
+      *concise = false;
     } else if (ceph_argparse_flag(args, i, "-h", "--help", (char*)NULL)) {
       usage();
     } else {
@@ -190,7 +192,7 @@ int main(int argc, const char **argv)
   common_init_finish(g_ceph_context);
 
   // parse user input
-  bool concise = false;
+  bool concise = true;
   string admin_socket;
   string admin_socket_cmd;
   parse_cmd_args(args, &in_file, &out_file, &mode, &concise, &admin_socket, &admin_socket_cmd);