mgr: add generic --help output

Creating an MgrStandby in order to call its usage() method has
two problems:

1) MgrStandby wants to connect to a running cluster; if the
   cluster isn't up, you'll be left staring at a blinking cursor.
2) MgrStandby::usage() doesn't print anything anyway.

This commit takes pretty much the same approach to printing
usage information as ceph_mon.cc, ceph_osd.cc and ceph_mds.cc.

Signed-off-by: Tim Serong <tserong@suse.com>

diff --git a/src/ceph_mgr.cc b/src/ceph_mgr.cc
index c3fcc276c79a824e8548f4acc9d3e241d3ca66e3..ae5feb3751acd15039bd9c711020275a8c725021 100644 (file)
--- a/src/ceph_mgr.cc
+++ b/src/ceph_mgr.cc
@@ -24,6 +24,12 @@
 
 #include "mgr/MgrStandby.h"
 
+static void usage()
+{
+  cout << "usage: ceph-mgr -i <ID> [flags]\n"
+       << std::endl;
+  generic_server_usage();
+}
 
 /**
  * A short main() which just instantiates a MgrStandby and
@@ -43,9 +49,7 @@ int main(int argc, const char **argv)
 
   // Handle --help
   if ((args.size() == 1 && (std::string(args[0]) == "--help" || std::string(args[0]) == "-h"))) {
-    MgrStandby mgr;
-    mgr.usage();
-    return 0;
+    usage();
   }
 
   global_init_daemonize(g_ceph_context);

diff --git a/src/mgr/MgrStandby.h b/src/mgr/MgrStandby.h
index d33c633dc424ebf4569f7286f3372de9579163a8..9d160a1064291a50f408b5f30de80f4cf503aa18 100644 (file)
--- a/src/mgr/MgrStandby.h
+++ b/src/mgr/MgrStandby.h
@@ -73,7 +73,6 @@ public:
 
   int init();
   void shutdown();
-  void usage() {}
   int main(vector<const char *> args);
   void handle_signal(int signum);
   void send_beacon();