summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-10-22 12:22:32 -0700
committerSage Weil <sage@inktank.com>2013-10-22 12:35:06 -0700
commitb33c3158d4fdd1829bebe1b8ccb99377b753e5a8 (patch)
treee254b6dd25094ed8b15ac83123ad4eabb25d73e7
parent15de2c48a10a495c65cde96aaec21bc739f131e9 (diff)
downloadceph-b33c3158d4fdd1829bebe1b8ccb99377b753e5a8.tar.gz
ceph: default 5 second timeout for -h
Signed-off-by: Sage Weil <sage@inktank.com>
-rwxr-xr-xsrc/ceph.in4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ceph.in b/src/ceph.in
index ec20198b697..9e5110dc229 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -589,6 +589,10 @@ def main():
if parsed_args.help:
do_basic_help(parser, childargs)
+ # short default timeout for -h
+ if not timeout:
+ timeout = 5
+
hdr('Monitor commands:')
print '[Contacting monitor, timeout after %d seconds]' % timeout