X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=contrib%2Fcollectd_unixsock.py;h=1b8e6b174ed8d8ad1a7abc1237842e03d5908075;hb=51a4e62d7d0e73d8d5822efaef1e3218b5ad0373;hp=ebe040d6a11846ab77fe446112668e29354f904f;hpb=0fe0b565ea84fb2363411366905c7cfb492cd709;p=collectd.git

diff --git a/contrib/collectd_unixsock.py b/contrib/collectd_unixsock.py
index ebe040d6..1b8e6b17 100644
--- a/contrib/collectd_unixsock.py
+++ b/contrib/collectd_unixsock.py
@@ -68,8 +68,9 @@ class Collectd():
         """
         numvalues = self._cmd('GETTHRESHOLD "%s"' % identifier)
         lines = []
-        if numvalues:
-            lines = self._readlines(numvalues)
+        if not numvalues or numvalues < 0:
+            raise KeyError("Identifier '%s' not found" % identifier)
+        lines = self._readlines(numvalues)
         return lines
 
     def getval(self, identifier, flush_after=True):
@@ -83,8 +84,9 @@ class Collectd():
         """
         numvalues = self._cmd('GETVAL "%s"' % identifier)
         lines = []
-        if numvalues:
-            lines = self._readlines(numvalues)
+        if not numvalues or numvalues < 0:
+            raise KeyError("Identifier '%s' not found" % identifier)
+        lines = self._readlines(numvalues)
         if flush_after:
             self.flush(identifiers=[identifier])
         return lines