From f2f5e9c8a8be6970c2683045ef9993ba60a0d63b Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Wed, 15 Aug 2012 11:20:18 -0400
Subject: made logging to syslog configurable and default for all logging

---
 src/lib/Bcfg2/Client/Frame.py          | 15 +++++----------
 src/lib/Bcfg2/Client/Tools/APK.py      |  4 ++--
 src/lib/Bcfg2/Client/Tools/Action.py   |  2 +-
 src/lib/Bcfg2/Client/Tools/__init__.py |  8 ++++----
 4 files changed, 12 insertions(+), 17 deletions(-)

(limited to 'src/lib/Bcfg2/Client')

diff --git a/src/lib/Bcfg2/Client/Frame.py b/src/lib/Bcfg2/Client/Frame.py
index bfdc90d38..a050464e2 100644
--- a/src/lib/Bcfg2/Client/Frame.py
+++ b/src/lib/Bcfg2/Client/Frame.py
@@ -133,7 +133,6 @@ class Frame:
             for entry in problems:
                 self.logger.error("%s:%s:%s" % (entry.tag, entry.get('type'),
                                                 entry.get('name')))
-            self.logger.error("")
 
         self.find_dups(config)
 
@@ -163,7 +162,6 @@ class Frame:
             self.logger.debug("The following entries are included multiple times:")
             for entry in multi:
                 self.logger.debug(entry)
-            self.logger.debug("")
 
     def __getattr__(self, name):
         if name in ['extra', 'handled', 'modified', '__important__']:
@@ -371,7 +369,6 @@ class Frame:
             if mbundles:
                 self.logger.info("The Following Bundles have been modified:")
                 self.logger.info([mbun.get('name') for mbun in mbundles])
-                self.logger.info("")
             tbm = [(t, b) for t in self.tools for b in mbundles]
             for tool, bundle in tbm:
                 try:
@@ -414,10 +411,10 @@ class Frame:
 
     def CondDisplayState(self, phase):
         """Conditionally print tracing information."""
-        self.logger.info('\nPhase: %s' % phase)
-        self.logger.info('Correct entries:\t%d' %
+        self.logger.info('Phase: %s' % phase)
+        self.logger.info('Correct entries:        %d' %
                          list(self.states.values()).count(True))
-        self.logger.info('Incorrect entries:\t%d' %
+        self.logger.info('Incorrect entries:      %d' %
                          list(self.states.values()).count(False))
         if phase == 'final' and list(self.states.values()).count(False):
             for entry in self.states.keys():
@@ -429,9 +426,9 @@ class Frame:
                     else:
                         self.logger.info("    %s:%s" % (entry.tag,
                                                         entry.get('name')))
-        self.logger.info('Total managed entries:\t%d' %
+        self.logger.info('Total managed entries:  %d' %
                          len(list(self.states.values())))
-        self.logger.info('Unmanaged entries:\t%d' % len(self.extra))
+        self.logger.info('Unmanaged entries:      %d' % len(self.extra))
         if phase == 'final' and self.setup['extra']:
             for entry in self.extra:
                 etype = entry.get('type')
@@ -442,8 +439,6 @@ class Frame:
                     self.logger.info("    %s:%s" % (entry.tag,
                                                     entry.get('name')))
 
-        self.logger.info("")
-
         if ((list(self.states.values()).count(False) == 0) and not self.extra):
             self.logger.info('All entries correct.')
 
diff --git a/src/lib/Bcfg2/Client/Tools/APK.py b/src/lib/Bcfg2/Client/Tools/APK.py
index aaaf2472f..d70916792 100644
--- a/src/lib/Bcfg2/Client/Tools/APK.py
+++ b/src/lib/Bcfg2/Client/Tools/APK.py
@@ -24,8 +24,8 @@ class APK(Bcfg2.Client.Tools.PkgTool):
         for pkg in zip(names, nameversions):
             pkgname = pkg[0]
             version = pkg[1][len(pkgname) + 1:]
-            self.logger.debug(" pkgname: %s\n version: %s" %
-                              (pkgname, version))
+            self.logger.debug(" pkgname: %s" % pkgname)
+            self.logger.debug(" version: %s" % version)
             self.installed[pkgname] = version
 
     def VerifyPackage(self, entry, modlist):
diff --git a/src/lib/Bcfg2/Client/Tools/Action.py b/src/lib/Bcfg2/Client/Tools/Action.py
index e13134e1f..52d4e6a3f 100644
--- a/src/lib/Bcfg2/Client/Tools/Action.py
+++ b/src/lib/Bcfg2/Client/Tools/Action.py
@@ -61,7 +61,7 @@ class Action(Bcfg2.Client.Tools.Tool):
             else:
                 return rc == 0
         else:
-            self.logger.debug("In dryrun mode: not running action:\n %s" %
+            self.logger.debug("In dryrun mode: not running action: %s" %
                               (entry.get('name')))
             return False
 
diff --git a/src/lib/Bcfg2/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py
index 1f191fce3..026c7ade0 100644
--- a/src/lib/Bcfg2/Client/Tools/__init__.py
+++ b/src/lib/Bcfg2/Client/Tools/__init__.py
@@ -209,10 +209,10 @@ class Tool(object):
 
         missing = self.missing_attrs(entry)
         if missing:
-            self.logger.error("Incomplete information for entry %s:%s; cannot install" \
-                              % (entry.tag, entry.get('name')))
-            self.logger.error("\t... due to absence of %s attribute" % \
-                              (":".join(missing)))
+            self.logger.error("Incomplete information for entry %s:%s; cannot "
+                              "install due to absence of attribute(s): %s" %
+                              (entry.tag, entry.get('name'),
+                               ", ".join(missing)))
             return False
         return True
 
-- 
cgit v1.2.3-1-g7c22