diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-07-20 04:50:01 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-07-20 04:50:01 +0000 |
| commit | cd4377fab21e0f500bef7f06543fa848a039c1e0 (patch) | |
| tree | ba00a55e430c052d6bed0b61c0f8bbe8ebedd313 /database/contexts/metric.c | |
| parent | Releasing debian version 1.40.1-1. (diff) | |
| download | netdata-cd4377fab21e0f500bef7f06543fa848a039c1e0.tar.xz netdata-cd4377fab21e0f500bef7f06543fa848a039c1e0.zip | |
Merging upstream version 1.41.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'database/contexts/metric.c')
| -rw-r--r-- | database/contexts/metric.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/database/contexts/metric.c b/database/contexts/metric.c index 80756b54c..55efde4e9 100644 --- a/database/contexts/metric.c +++ b/database/contexts/metric.c @@ -33,7 +33,7 @@ inline NETDATA_DOUBLE rrdmetric_acquired_last_stored_value(RRDMETRIC_ACQUIRED *r RRDMETRIC *rm = rrdmetric_acquired_value(rma); if(rm->rrddim) - return rm->rrddim->last_stored_value; + return rm->rrddim->collector.last_stored_value; return NAN; } @@ -263,13 +263,13 @@ void rrdmetric_from_rrddim(RRDDIM *rd) { #define rrddim_get_rrdmetric(rd) rrddim_get_rrdmetric_with_trace(rd, __FUNCTION__) static inline RRDMETRIC *rrddim_get_rrdmetric_with_trace(RRDDIM *rd, const char *function) { if(unlikely(!rd->rrdmetric)) { - error("RRDMETRIC: RRDDIM '%s' is not linked to an RRDMETRIC at %s()", rrddim_id(rd), function); + netdata_log_error("RRDMETRIC: RRDDIM '%s' is not linked to an RRDMETRIC at %s()", rrddim_id(rd), function); return NULL; } RRDMETRIC *rm = rrdmetric_acquired_value(rd->rrdmetric); if(unlikely(!rm)) { - error("RRDMETRIC: RRDDIM '%s' lost the link to its RRDMETRIC at %s()", rrddim_id(rd), function); + netdata_log_error("RRDMETRIC: RRDDIM '%s' lost the link to its RRDMETRIC at %s()", rrddim_id(rd), function); return NULL; } |