From cd4377fab21e0f500bef7f06543fa848a039c1e0 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 20 Jul 2023 06:50:01 +0200 Subject: Merging upstream version 1.41.0. Signed-off-by: Daniel Baumann --- libnetdata/eval/eval.c | 4 ++-- libnetdata/eval/eval.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'libnetdata/eval') diff --git a/libnetdata/eval/eval.c b/libnetdata/eval/eval.c index c7570bd2f..236be932b 100644 --- a/libnetdata/eval/eval.c +++ b/libnetdata/eval/eval.c @@ -1122,14 +1122,14 @@ EVAL_EXPRESSION *expression_parse(const char *string, const char **failed_at, in if(!op) { unsigned long pos = s - string + 1; - error("failed to parse expression '%s': %s at character %lu (i.e.: '%s').", string, expression_strerror(err), pos, s); + netdata_log_error("failed to parse expression '%s': %s at character %lu (i.e.: '%s').", string, expression_strerror(err), pos, s); return NULL; } BUFFER *out = buffer_create(1024, NULL); print_parsed_as_node(out, op, &err); if(err != EVAL_ERROR_OK) { - error("failed to re-generate expression '%s' with reason: %s", string, expression_strerror(err)); + netdata_log_error("failed to re-generate expression '%s' with reason: %s", string, expression_strerror(err)); eval_node_free(op); buffer_free(out); return NULL; diff --git a/libnetdata/eval/eval.h b/libnetdata/eval/eval.h index 1633ec505..05a26936b 100644 --- a/libnetdata/eval/eval.h +++ b/libnetdata/eval/eval.h @@ -12,9 +12,9 @@ typedef enum rrdcalc_status { RRDCALC_STATUS_UNDEFINED = -1, RRDCALC_STATUS_UNINITIALIZED = 0, RRDCALC_STATUS_CLEAR = 1, - RRDCALC_STATUS_RAISED = 2, - RRDCALC_STATUS_WARNING = 3, - RRDCALC_STATUS_CRITICAL = 4 + RRDCALC_STATUS_RAISED = 2, // DO NOT CHANGE THESE NUMBERS + RRDCALC_STATUS_WARNING = 3, // DO NOT CHANGE THESE NUMBERS + RRDCALC_STATUS_CRITICAL = 4, // DO NOT CHANGE THESE NUMBERS } RRDCALC_STATUS; typedef struct eval_variable { -- cgit v1.2.3