From 3a0618331e009439ce6b9c664915669884cd4aed Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 12 Feb 2013 16:02:24 -0500
Subject: better Executor class for client tools

---
 src/lib/Bcfg2/Client/Tools/POSIXUsers.py | 77 +++++---------------------------
 1 file changed, 11 insertions(+), 66 deletions(-)

(limited to 'src/lib/Bcfg2/Client/Tools/POSIXUsers.py')

diff --git a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
index 3248cef9c..e9db33d16 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
@@ -1,60 +1,11 @@
 """ A tool to handle creating users and groups with useradd/mod/del
 and groupadd/mod/del """
 
-import sys
 import pwd
 import grp
-import subprocess
-from Bcfg2.Utils import PackedDigitRange
 import Bcfg2.Client.XML
 import Bcfg2.Client.Tools
-
-
-class ExecutionError(Exception):
-    """ Raised when running an external command fails """
-
-    def __init__(self, msg, retval=None):
-        Exception.__init__(self, msg)
-        self.retval = retval
-
-    def __str__(self):
-        return "%s (rv: %s)" % (Exception.__str__(self),
-                                          self.retval)
-
-
-class Executor(object):
-    """ A better version of Bcfg2.Client.Tool.Executor, which captures
-    stderr, raises exceptions on error, and doesn't use the shell to
-    execute by default """
-
-    def __init__(self, logger):
-        self.logger = logger
-        self.stdout = None
-        self.stderr = None
-        self.retval = None
-
-    def run(self, command, inputdata=None, shell=False):
-        """ Run a command, given as a list, optionally giving it the
-        specified input data """
-        self.logger.debug("Running: %s" % " ".join(command))
-        proc = subprocess.Popen(command, shell=shell, bufsize=16384,
-                                stdin=subprocess.PIPE, stdout=subprocess.PIPE,
-                                stderr=subprocess.PIPE, close_fds=True)
-        if inputdata:
-            for line in inputdata.splitlines():
-                self.logger.debug('> %s' % line)
-            (self.stdout, self.stderr) = proc.communicate(inputdata)
-        else:
-            (self.stdout, self.stderr) = proc.communicate()
-        for line in self.stdout.splitlines():  # pylint: disable=E1103
-            self.logger.debug('< %s' % line)
-        self.retval = proc.wait()
-        if self.retval == 0:
-            for line in self.stderr.splitlines():  # pylint: disable=E1103
-                self.logger.warning(line)
-            return True
-        else:
-            raise ExecutionError(self.stderr, self.retval)
+from Bcfg2.Utils import PackedDigitRange
 
 
 class POSIXUsers(Bcfg2.Client.Tools.Tool):
@@ -82,7 +33,6 @@ class POSIXUsers(Bcfg2.Client.Tools.Tool):
         Bcfg2.Client.Tools.Tool.__init__(self, logger, setup, config)
         self.set_defaults = dict(POSIXUser=self.populate_user_entry,
                                  POSIXGroup=lambda g: g)
-        self.cmd = Executor(logger)
         self._existing = None
         self._whitelist = dict(POSIXUser=None, POSIXGroup=None)
         self._blacklist = dict(POSIXUser=None, POSIXGroup=None)
@@ -273,16 +223,14 @@ class POSIXUsers(Bcfg2.Client.Tools.Tool):
             action = "add"
         else:
             action = "mod"
-        try:
-            self.cmd.run(self._get_cmd(action,
-                                       self.set_defaults[entry.tag](entry)))
+        rv = self.cmd.run(self._get_cmd(action,
+                                        self.set_defaults[entry.tag](entry)))
+        if rv.success:
             self.modified.append(entry)
-            return True
-        except ExecutionError:
+        else:
             self.logger.error("POSIXUsers: Error creating %s %s: %s" %
-                              (entry.tag, entry.get("name"),
-                               sys.exc_info()[1]))
-            return False
+                              (entry.tag, entry.get("name"), rv.error))
+        return rv.success
 
     def _get_cmd(self, action, entry):
         """ Get a command to perform the appropriate action (add, mod,
@@ -337,11 +285,8 @@ class POSIXUsers(Bcfg2.Client.Tools.Tool):
 
     def _remove(self, entry):
         """ Remove an entry """
-        try:
-            self.cmd.run(self._get_cmd("del", entry))
-            return True
-        except ExecutionError:
+        rv = self.cmd.run(self._get_cmd("del", entry))
+        if not rv.success:
             self.logger.error("POSIXUsers: Error deleting %s %s: %s" %
-                              (entry.tag, entry.get("name"),
-                               sys.exc_info()[1]))
-            return False
+                              (entry.tag, entry.get("name"), rv.error))
+        return rv.success
-- 
cgit v1.2.3-1-g7c22