projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
'curl', 'memcachec', 'tail' and 'tail_csv' plugins: Use 'Plugin' as option name
[collectd.git]
/
contrib
/
collectd_unixsock.py
diff --git
a/contrib/collectd_unixsock.py
b/contrib/collectd_unixsock.py
index
c482ac6
..
5cd4ab8
100644
(file)
--- a/
contrib/collectd_unixsock.py
+++ b/
contrib/collectd_unixsock.py
@@
-68,8
+68,9
@@
class Collectd():
"""
numvalues = self._cmd('GETTHRESHOLD "%s"' % identifier)
lines = []
"""
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):
return lines
def getval(self, identifier, flush_after=True):
@@
-83,8
+84,9
@@
class Collectd():
"""
numvalues = self._cmd('GETVAL "%s"' % identifier)
lines = []
"""
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
if flush_after:
self.flush(identifiers=[identifier])
return lines
@@
-156,7
+158,7
@@
class Collectd():
self._sock.send(c + "\n")
status_message = self._readline()
if self.noisy:
self._sock.send(c + "\n")
status_message = self._readline()
if self.noisy:
- print "[recive] %s" % status_message
+ print "[rec
e
ive] %s" % status_message
if not status_message:
return None
code, message = status_message.split(' ', 1)
if not status_message:
return None
code, message = status_message.split(' ', 1)
@@
-172,8
+174,8
@@
class Collectd():
print "[socket] connected to %s" % self.path
return sock
except socket.error, (errno, errstr):
print "[socket] connected to %s" % self.path
return sock
except socket.error, (errno, errstr):
- sys.stderr
or
.write("[error] Connecting to socket failed: [%d] %s"
-
% (errno, errstr))
+ sys.stderr.write("[error] Connecting to socket failed: [%d] %s"
+ % (errno, errstr))
return None
def _readline(self):
return None
def _readline(self):
@@
-193,8
+195,8
@@
class Collectd():
buf.append(data)
return ''.join(buf)
except socket.error, (errno, errstr):
buf.append(data)
return ''.join(buf)
except socket.error, (errno, errstr):
- sys.stderr
or
.write("[error] Reading from socket failed: [%d] %s"
-
% (errno, errstr))
+ sys.stderr.write("[error] Reading from socket failed: [%d] %s"
+ % (errno, errstr))
self._sock = self._connect()
return None
self._sock = self._connect()
return None
@@
-218,8
+220,8
@@
class Collectd():
try:
self._sock.close()
except socket.error, (errno, errstr):
try:
self._sock.close()
except socket.error, (errno, errstr):
- sys.stderr
or
.write("[error] Closing socket failed: [%d] %s"
-
% (errno, errstr))
+ sys.stderr.write("[error] Closing socket failed: [%d] %s"
+ % (errno, errstr))
if __name__ == '__main__':
if __name__ == '__main__':