From 58daab21cd043e1dc37024a7f99b396788372918 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 9 Mar 2024 14:19:48 +0100 Subject: Merging upstream version 1.44.3. Signed-off-by: Daniel Baumann --- claim/claim.c | 4 ++-- claim/netdata-claim.sh.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'claim') diff --git a/claim/claim.c b/claim/claim.c index 1b3f765ca..774b65ebb 100644 --- a/claim/claim.c +++ b/claim/claim.c @@ -323,11 +323,11 @@ static bool check_claim_param(const char *s) { } void claim_reload_all(void) { - error_log_limit_unlimited(); + nd_log_limits_unlimited(); load_claiming_state(); registry_update_cloud_base_url(); rrdpush_send_claimed_id(localhost); - error_log_limit_reset(); + nd_log_limits_reset(); } int api_v2_claim(struct web_client *w, char *url) { diff --git a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in index cc6c10932..a3db591cd 100755 --- a/claim/netdata-claim.sh.in +++ b/claim/netdata-claim.sh.in @@ -175,7 +175,7 @@ elif [ -f "${MACHINE_GUID_FILE}" ]; then echo >&2 "netdata.public.unique.id is not readable. Please make sure you have rights to read it (Filename: ${MACHINE_GUID_FILE})." exit 18 else - if mkdir -p "${MACHINE_GUID_FILE%/*}" && /bin/echo -n "$(gen_id)" > "${MACHINE_GUID_FILE}"; then + if mkdir -p "${MACHINE_GUID_FILE%/*}" && echo -n "$(gen_id)" > "${MACHINE_GUID_FILE}"; then ID="$(cat "${MACHINE_GUID_FILE}")" MGUID=$ID else -- cgit v1.2.3