summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2006-04-07 18:18:54 +0000
committerNarayan Desai <desai@mcs.anl.gov>2006-04-07 18:18:54 +0000
commitd6c5f756a93fa38dbb77e4eb23c7ee45296d554c (patch)
treeded14adc6623df7832c8aeb9ef56b6e1166028e5 /src
parent40b7d470cb03ac18115d45a089d56d0552b8e145 (diff)
downloadbcfg2-d6c5f756a93fa38dbb77e4eb23c7ee45296d554c.tar.gz
bcfg2-d6c5f756a93fa38dbb77e4eb23c7ee45296d554c.tar.bz2
bcfg2-d6c5f756a93fa38dbb77e4eb23c7ee45296d554c.zip
Improve error messages for Svc/Pkgmgr
Remove component name from unknown type stdout messages git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1825 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rw-r--r--src/lib/Logging.py2
-rw-r--r--src/lib/Server/Plugin.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Logging.py b/src/lib/Logging.py
index 65ae15187..93ed1ca6f 100644
--- a/src/lib/Logging.py
+++ b/src/lib/Logging.py
@@ -76,7 +76,7 @@ class TermiosFormatter(logging.Formatter):
elif type(record.msg) == lxml.etree._Element:
returns.append(str(xml_print(record.msg)))
else:
- returns.append(record.name + ':' + str(record.msg))
+ returns.append(str(record.msg))
if record.exc_info:
returns.append(self.formatException(record.exc_info))
return '\n'.join(returns)
diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py
index b83ea422b..4c4406747 100644
--- a/src/lib/Server/Plugin.py
+++ b/src/lib/Server/Plugin.py
@@ -301,7 +301,7 @@ class XMLPrioDir(Plugin, DirectoryBacked):
else:
prio = [int(src.priority) for src in matching]
if prio.count(max(prio)) > 1:
- self.logger.error("Found multiple %s sources with same priority for %s, pkg %s" %
+ self.logger.error("Found conflicting %s sources with same priority for %s, pkg %s" %
(self.__element__.lower(), metadata.hostname, entry.get('name')))
raise PluginExecutionError
index = prio.index(max(prio))