diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-15 11:20:18 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-15 11:20:18 -0400 |
| commit | f2f5e9c8a8be6970c2683045ef9993ba60a0d63b (patch) | |
| tree | cc4a3df003710ed839f35f24b2810fbbdfd03eff /src/lib/Bcfg2/Client/Tools | |
| parent | d1073cc867ffc96952de4dddc5fb30d51fd5bf4e (diff) | |
| download | bcfg2-f2f5e9c8a8be6970c2683045ef9993ba60a0d63b.tar.gz bcfg2-f2f5e9c8a8be6970c2683045ef9993ba60a0d63b.tar.bz2 bcfg2-f2f5e9c8a8be6970c2683045ef9993ba60a0d63b.zip | |
made logging to syslog configurable and default for all logging
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/APK.py | 4 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/Action.py | 2 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/__init__.py | 8 |
3 files changed, 7 insertions, 7 deletions
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 |