latency: Silence "no replies received" when no IPv6 connectivity

This will just clutter the log files

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/_collecty/_collectymodule.c b/src/_collecty/_collectymodule.c
index 25b1979f64a7c5305f299d83a838168fd64bb825..08462cb85c1bba1d00a781c868afff8ad8b14a47 100644 (file)
--- a/src/_collecty/_collectymodule.c
+++ b/src/_collecty/_collectymodule.c
@@ -66,6 +66,10 @@ PyMODINIT_FUNC PyInit__collecty(void) {
        Py_INCREF(PyExc_PingAddHostError);
        PyModule_AddObject(m, "PingAddHostError", PyExc_PingAddHostError);
 
+       PyExc_PingNoReplyError = PyErr_NewException("_collecty.PingNoReplyError", NULL, NULL);
+       Py_INCREF(PyExc_PingNoReplyError);
+       PyModule_AddObject(m, "PingNoReplyError", PyExc_PingNoReplyError);
+
        Py_INCREF(&SensorType);
        PyModule_AddObject(m, "Sensor", (PyObject*)&SensorType);
 

diff --git a/src/_collecty/_collectymodule.h b/src/_collecty/_collectymodule.h
index f34a31433d82fcb47d0159583e5993e3cb26faf8..56282f1c9567df46e2b754192c50ea90108246b5 100644 (file)
--- a/src/_collecty/_collectymodule.h
+++ b/src/_collecty/_collectymodule.h
@@ -59,6 +59,7 @@ PyObject* BlockDevice_get_temperature(PyObject* self);
 /* ping */
 PyObject* PyExc_PingError;
 PyObject* PyExc_PingAddHostError;
+PyObject* PyExc_PingNoReplyError;
 
 typedef struct {
        PyObject_HEAD

diff --git a/src/_collecty/ping.c b/src/_collecty/ping.c
index 6ed5590100c8ce80144b3edd1d5c8153453a3958..1d66e2fb8de7da1b8e505bd63de660d54a46f57c 100644 (file)
--- a/src/_collecty/ping.c
+++ b/src/_collecty/ping.c
@@ -294,7 +294,7 @@ PyObject* Ping_ping(PingObject* self, PyObject* args, PyObject* kwds) {
        }
 
        if (self->stats.packets_rcvd == 0) {
-               PyErr_Format(PyExc_PingError, "No replies received from %s", self->host);
+               PyErr_Format(PyExc_PingNoReplyError, "No replies received from %s", self->host);
                return NULL;
        }
 

diff --git a/src/collecty/plugins/latency.py b/src/collecty/plugins/latency.py
index a2c12ad7125cc320884d1b517295c1ffd4afa0e4..0ef70eb91a11818bb03877cb0de4b588cf2d9eb2 100644 (file)
--- a/src/collecty/plugins/latency.py
+++ b/src/collecty/plugins/latency.py
@@ -159,6 +159,11 @@ class LatencyObject(base.Object):
                                result += (None, None, None)
                                continue
 
+                       except collecty._collecty.PingNoReplyError:
+                               # Unknown but 100% loss
+                               result += (None, None, 1)
+                               continue
+
                        except collecty._collecty.PingError as e:
                                self.log.warning(_("Could not run latency check for %(host)s: %(msg)s") \
                                        % { "host" : self.hostname, "msg" : e })