X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftarget_notification.c;h=7908a29b9bfdc0e3af00d852a8e93c48c156e7c7;hb=9204a08464154faaca89690ad205989c121335cb;hp=96598afd76fd53500948e34dda8bf516726e4371;hpb=0ebe3efc7b797546bcae87a946cff1c4cf472919;p=collectd.git diff --git a/src/target_notification.c b/src/target_notification.c index 96598afd..7908a29b 100644 --- a/src/target_notification.c +++ b/src/target_notification.c @@ -176,7 +176,7 @@ static int tn_create (const oconfig_item_t *ci, void **user_data) /* {{{ */ if (status != 0) { - tn_destroy ((void *) data); + tn_destroy ((void *) &data); return (status); } @@ -209,7 +209,7 @@ static int tn_invoke (const data_set_t *ds, value_list_t *vl, /* {{{ */ /* Initialize the structure. */ memset (&n, 0, sizeof (n)); n.severity = data->severity; - n.time = time (NULL); + n.time = cdtime (); sstrncpy (n.message, data->message, sizeof (n.message)); sstrncpy (n.host, vl->host, sizeof (n.host)); sstrncpy (n.plugin, vl->plugin, sizeof (n.plugin)); @@ -251,12 +251,12 @@ static int tn_invoke (const data_set_t *ds, value_list_t *vl, /* {{{ */ /* If this is a gauge value, use the current value. */ if (ds->ds[i].type == DS_TYPE_GAUGE) ssnprintf (value_str, sizeof (value_str), - "%g", (double) vl->values[i].gauge); + GAUGE_FORMAT, (double) vl->values[i].gauge); /* If it's a counter, try to use the current rate. This may fail, if the * value has been renamed. */ else if (rates != NULL) ssnprintf (value_str, sizeof (value_str), - "%g", (double) rates[i]); + GAUGE_FORMAT, (double) rates[i]); /* Since we don't know any better, use the string `unknown'. */ else sstrncpy (value_str, "unknown", sizeof (value_str));