c-foreach-restart: make inner function a class method

eevans · eevans · commit f0c6352a0ec2 · 2016-09-27T10:57:15.000-05:00
diff --git a/cassandra/tools/instances.py b/cassandra/tools/instances.py
@@ -21,7 +21,6 @@ def get_instances():
     for descr in __get_descriptor_files():
         yield Instance(descr)
 
-
 class Instance(object):
     def __init__(self, descr):
         with open(descr) as fobj:
@@ -52,28 +51,14 @@ def restart(self, retries=10, delay=6, post_shutdown=None):
         self.__log_info("Draining...")
         self.nodetool.run("drain")
 
-        def exec_command(*args):
-            (retcode, stdout, stderr) = call(*args)
-            stdout = stdout.rstrip()
-            stderr = stderr.rstrip()
-            if stdout:
-                for line in stdout.splitlines():
-                    self.__log_info(line)
-            if stderr:
-                for line in stderr.splitlines():
-                    self.__log_error(line)
-            if retcode != 0:
-                self.__log_error("%s returned exit code %s", args[0], retcode)
-                raise RuntimeError("{} returned exit code {}".format(args[0], retcode))
-
         # Restart Cassandra
         self.__log_info("Stopping service %s", self.service_name)
-        exec_command("systemctl", "stop", self.service_name)
+        self.__exec_command("systemctl", "stop", self.service_name)
         if post_shutdown:
             self.__log_info("Executing post-shutdown command: %s", post_shutdown)
-            exec_command(*(post_shutdown.strip().split()))
+            self.__exec_command(*(post_shutdown.strip().split()))
         self.__log_info("Starting service %s", self.service_name)
-        exec_command("systemctl", "start", self.service_name)
+        self.__exec_command("systemctl", "start", self.service_name)
 
         # Wait for Cassandra to come back up before continuing
         listening = False
@@ -94,6 +79,20 @@ def exec_command(*args):
             self.__log_error("CQL (%s:%s) DOWN", self.rpc_address, self.native_transport_port)
             raise Exception("{} restart FAILED".format(self.service_name))
 
+    def __exec_command(self, *args):
+        (retcode, stdout, stderr) = call(*args)
+        stdout = stdout.rstrip()
+        stderr = stderr.rstrip()
+        if stdout:
+            for line in stdout.splitlines():
+                self.__log_info(line)
+        if stderr:
+            for line in stderr.splitlines():
+                self.__log_error(line)
+        if retcode != 0:
+            self.__log_error("%s returned exit code %s", args[0], retcode)
+            raise RuntimeError("{} returned exit code {}".format(args[0], retcode))
+
     def __log_debug(self, msg, *args, **kwargs):
         self.__log(logging.DEBUG, msg, *args, **kwargs)
 
