From: Dan Mick <dan.mick@redhat.com>
Date: Fri, 14 Apr 2017 03:20:30 +0000 (-0700)
Subject: ceph.in: Move daemonperf to its own function
X-Git-Tag: v12.0.3~71^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cecdadd3ee234d9c636f9f60880da7dffa467259;p=ceph.git

ceph.in: Move daemonperf to its own function

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/src/ceph.in b/src/ceph.in
index 8b447122ea7a..1068167d66bb 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -600,23 +600,7 @@ def maybe_daemon_command(parsed_args, childargs):
             return True, errno.EINVAL
 
     if sockpath and daemon_perf:
-        interval = 1
-        count = None
-        if len(childargs) > 0:
-            try:
-                interval = float(childargs[0])
-                if interval < 0:
-                    raise ValueError
-            except ValueError:
-                print('daemonperf: interval should be a positive number', file=sys.stderr)
-                return True, errno.EINVAL
-        if len(childargs) > 1:
-            if not childargs[1].isdigit():
-                print('daemonperf: count should be a positive integer', file=sys.stderr)
-                return True, errno.EINVAL
-            count = int(childargs[1])
-        DaemonWatcher(sockpath).run(interval, count)
-        return True, 0
+        return True, daemonperf(childargs, sockpath)
     elif sockpath:
         try:
             raw_write(admin_socket(sockpath, childargs, parsed_args.output_format))
@@ -627,6 +611,27 @@ def maybe_daemon_command(parsed_args, childargs):
 
     return False, 0
 
+
+def daemonperf(childargs, sockpath):
+    """ Handle daemonperf command; returns errno or 0 """
+    interval = 1
+    count = None
+    if len(childargs) > 0:
+        try:
+            interval = float(childargs[0])
+            if interval < 0:
+                raise ValueError
+        except ValueError:
+            print('daemonperf: interval should be a positive number', file=sys.stderr)
+            return errno.EINVAL
+    if len(childargs) > 1:
+        if not childargs[1].isdigit():
+            print('daemonperf: count should be a positive integer', file=sys.stderr)
+            return errno.EINVAL
+        count = int(childargs[1])
+    DaemonWatcher(sockpath).run(interval, count)
+    return 0
+
 ###
 # main
 ###