Merge branch 'collectd-4.5' into collectd-4.6

[collectd.git] / src / memcached.c

diff --git a/src/memcached.c b/src/memcached.c
index fb33880..b5a4b20 100644 (file)
--- a/src/memcached.c
+++ b/src/memcached.c
@@ -234,7 +234,6 @@ static void submit_counter (const char *type, const char *type_inst,
 
        vl.values = values;
        vl.values_len = 1;
-       vl.time = time (NULL);
        sstrncpy (vl.host, hostname_g, sizeof (vl.host));
        sstrncpy (vl.plugin, "memcached", sizeof (vl.plugin));
        sstrncpy (vl.type, type, sizeof (vl.type));
@@ -475,8 +474,16 @@ static int memcached_read (void) /* {{{ */
        if ((octets_rx != 0) || (octets_tx != 0))
                submit_counter2 ("memcached_octets", NULL, octets_rx, octets_tx);
        
-       if (! isnan (gets) && !isnan (hits))
-               submit_gauge ("percent", "hitratio", (hits / gets) * 100.0);
+       if (!isnan (gets) && !isnan (hits))
+       {
+               gauge_t rate = NAN;
+
+               if (gets != 0.0)
+                       rate = 100.0 * hits / gets;
+
+               submit_gauge ("percent", "hitratio", rate);
+       }
+
        return 0;
 }
 /* }}} */