From 35b1df511a95d05261ca759eb42056ada54a6802 Mon Sep 17 00:00:00 2001 From: Florent Date: Fri, 1 Mar 2013 20:27:28 +0100 Subject: [PATCH] Take the first element of an list And fix encoding issue --- contrib/munin/generic/generic-munin | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/munin/generic/generic-munin b/contrib/munin/generic/generic-munin index be673f2b..1b8391f7 100755 --- a/contrib/munin/generic/generic-munin +++ b/contrib/munin/generic/generic-munin @@ -155,6 +155,8 @@ class GenericMuninPlugin(object): attribs = self.attribvalue.split('/') for attrib in attribs: result = getattr(result, attrib) + if type(result) is list: + result = result[0] return result def monitored(self, result): @@ -201,7 +203,7 @@ class GenericMuninPlugin(object): if first: type = 'AREA' first = False - self.write_output('%s.label %s' % (id, getattr(result, self.attriblabel).encode('iso-8859-15'))) + self.write_output('%s.label %s' % (id.encode('iso-8859-15'), getattr(result, self.attriblabel).encode('iso-8859-15'))) if self.cumulate: self.write_output('%s.draw %s' % (id, type)) except CallErrors, errors: