diff options
author | Sage Weil <sage@inktank.com> | 2013-08-08 12:33:43 -0700 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-08-08 12:33:43 -0700 |
commit | a71fc46b4bb59354df87a2015a689d69cb98ee1a (patch) | |
tree | c8af009f8fb53e59be3b25426de950e9fa0c900a | |
parent | 2e280874f685201f5b89c25fb8fe8f9850d8614e (diff) | |
parent | fd1923589c3546fc35132459f0e228f596330959 (diff) | |
download | ceph-a71fc46b4bb59354df87a2015a689d69cb98ee1a.tar.gz |
Merge pull request #488 from dmick/wip-dmick-daemon-einval
Wip dmick daemon einval
Reviewed-by: Sage Weil <sage@inktank.com>
-rwxr-xr-x | src/ceph.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ceph.in b/src/ceph.in index 4dd9dfc37ae..ed009577230 100755 --- a/src/ceph.in +++ b/src/ceph.in @@ -321,7 +321,7 @@ def admin_socket(asok_path, cmd, format=''): sigdict = parse_json_funcsigs(cmd_json, 'cli') valid_dict = validate_command(sigdict, cmd) if not valid_dict: - return -errno.EINVAL + raise RuntimeError('invalid command') if format: valid_dict['format'] = format @@ -515,6 +515,7 @@ def main(): print admin_socket(childargs[1], childargs[2:], format) except Exception as e: print >> sys.stderr, 'admin_socket: {0}'.format(e) + return errno.EINVAL return 0 else: # try resolve daemon name @@ -523,10 +524,11 @@ def main(): print admin_socket(path, childargs[2:], format) except Exception as e: print >> sys.stderr, 'admin_socket: {0}'.format(e) + return errno.EINVAL return 0 else: print >> sys.stderr, 'Daemon requires at least 2 arguments' - return 1 + return errno.EINVAL # handle any 'generic' ceph arguments that we didn't parse here global cluster_handle |