Yum: handle and log helper errors better

2 files changed, 61 insertions, 24 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
index 20b2c9500..4c143e069 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
@@ -878,11 +878,16 @@ class YumCollection(Collection):
                   ``bcfg2-yum-helper`` command.
         """
         cmd = [self.helper, "-c", self.cfgfile]
-        verbose = self.debug_flag or self.setup['verbose']
-        if verbose:
+        if self.setup['verbose']:
+            cmd.append("-v")
+        if self.debug_flag:
+            if not self.setup['verbose']:
+                # ensure that running in debug gets -vv, even if
+                # verbose is not enabled
+                cmd.append("-v")
             cmd.append("-v")
         cmd.append(command)
-        self.debug_log("Packages: running %s" % " ".join(cmd), flag=verbose)
+        self.debug_log("Packages: running %s" % " ".join(cmd))
         try:
             helper = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
         except OSError:
@@ -897,12 +902,18 @@ class YumCollection(Collection):
         else:
             (stdout, stderr) = helper.communicate()
         rv = helper.wait()
+        errlines = stderr.splitlines()
         if rv:
             self.logger.error("Packages: error running bcfg2-yum-helper "
-                              "(returned %d): %s" % (rv, stderr))
+                              "(returned %d): %s" % (rv, errlines[0]))
+            for line in errlines[1:]:
+                self.logger.error("Packages: %s" % line)
         else:
             self.debug_log("Packages: debug info from bcfg2-yum-helper: %s" %
-                           stderr, flag=verbose)
+                           lines[0], flag=verbose)
+            for line in errlines[1:]:
+                self.debug_log("Packages: %s" % line)
+
         try:
             return json.loads(stdout)
         except ValueError:
diff --git a/src/sbin/bcfg2-yum-helper b/src/sbin/bcfg2-yum-helper
index 7dbdad16b..48f28257f 100755
--- a/src/sbin/bcfg2-yum-helper
+++ b/src/sbin/bcfg2-yum-helper
@@ -223,27 +223,53 @@ def main():
 
     depsolver = DepSolver(options.config, options.verbose)
     if cmd == "clean":
-        depsolver.clean_cache()
-        print(json.dumps(True))
+        try:
+            depsolver.clean_cache()
+            print(json.dumps(True))
+        except:
+            logger.error("Unexpected error cleaning cache: %s" %
+                         sys.exc_info()[1], exc_info=1)
+            print(json.dumps(False))
+            return 2
     elif cmd == "complete":
-        data = json.loads(sys.stdin.read())
-        depsolver.groups = data['groups']
-        (packages, unknown) = depsolver.complete([pkg_to_tuple(p)
-                                                  for p in data['packages']])
-        print(json.dumps(dict(packages=list(packages),
-                              unknown=list(unknown))))
+        try:
+            data = json.loads(sys.stdin.read())
+        except:
+            logger.error("Unexpected error decoding JSON input: %s" %
+                         sys.exc_info()[1])
+            return 2
+        try:
+            depsolver.groups = data['groups']
+            (packages, unknown) = depsolver.complete(
+                [pkg_to_tuple(p) for p in data['packages']])
+            print(json.dumps(dict(packages=list(packages),
+                                  unknown=list(unknown))))
+        except:
+            logger.error("Unexpected error completing package set: %s" %
+                         sys.exc_info()[1], exc_info=1)
+            print(json.dumps(dict(packages=[], unknown=data['packages'])))
+            return 2
     elif cmd == "get_groups":
-        data = json.loads(sys.stdin.read())
-        rv = dict()
-        for gdata in data:
-            if "type" in gdata:
-                packages = depsolver.get_group(gdata['group'],
-                                               ptype=gdata['type'])
-            else:
-                packages = depsolver.get_group(gdata['group'])
-            rv[gdata['group']] = list(packages)
-        print(json.dumps(rv))
-
+        try:
+            data = json.loads(sys.stdin.read())
+            rv = dict()
+            for gdata in data:
+                if "type" in gdata:
+                    packages = depsolver.get_group(gdata['group'],
+                                                   ptype=gdata['type'])
+                else:
+                    packages = depsolver.get_group(gdata['group'])
+                rv[gdata['group']] = list(packages)
+            print(json.dumps(rv))
+        except:
+            logger.error("Unexpected error getting groups: %s" %
+                         sys.exc_info()[1], exc_info=1)
+            print(json.dumps(dict()))
+            return 2
+    else:
+        logger.error("Unknown command %s" % cmd)
+        print(json.dumps(None))
+        return 2
 
 if __name__ == '__main__':
     sys.exit(main())