diff options
author | Sage Weil <sage@inktank.com> | 2013-08-14 22:16:46 -0700 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-08-14 22:16:46 -0700 |
commit | f547a9939cc69ea69a9087b3dd88d1b2f138680f (patch) | |
tree | b35b551fa1941e4637d57a950e50a08a3ecb4f19 | |
parent | 4422f21a6586467a63ce6841552d0f60aa849cf1 (diff) | |
download | ceph-f547a9939cc69ea69a9087b3dd88d1b2f138680f.tar.gz |
ceph: fix return code for --admin-daemonwip-5973
Simplify this by making it take the same path as the (new) 'daemon
...' syntax.
Backport: dumpling
Signed-off-by: Sage Weil <sage@inktank.com>
-rwxr-xr-x | src/ceph.in | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/ceph.in b/src/ceph.in index fe369f82467..2baa9b5e133 100755 --- a/src/ceph.in +++ b/src/ceph.in @@ -507,11 +507,7 @@ def main(): format = parsed_args.output_format if parsed_args.admin_socket: - try: - print admin_socket(parsed_args.admin_socket, childargs, format) - except Exception as e: - print >> sys.stderr, 'admin_socket: {0}'.format(e) - return 0 + childargs = [ 'daemon', parsed_args.admin_socket ] + childargs if len(childargs) > 0 and childargs[0] == "daemon": if len(childargs) > 2: |