summaryrefslogtreecommitdiffstats
path: root/claim/claim.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2022-11-30 18:47:00 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2022-11-30 18:47:00 +0000
commit03bf87dcb06f7021bfb2df2fa8691593c6148aff (patch)
treee16b06711a2ed77cafb4b7754be0220c3d14a9d7 /claim/claim.c
parentAdding upstream version 1.36.1. (diff)
downloadnetdata-03bf87dcb06f7021bfb2df2fa8691593c6148aff.tar.xz
netdata-03bf87dcb06f7021bfb2df2fa8691593c6148aff.zip
Adding upstream version 1.37.0.upstream/1.37.0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'claim/claim.c')
-rw-r--r--claim/claim.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/claim/claim.c b/claim/claim.c
index 59c21aa35..d997fc84e 100644
--- a/claim/claim.c
+++ b/claim/claim.c
@@ -2,7 +2,8 @@
#include "claim.h"
#include "registry/registry_internals.h"
-#include "aclk/aclk_api.h"
+#include "aclk/aclk.h"
+#include "aclk/aclk_proxy.h"
char *claiming_pending_arguments = NULL;
@@ -57,7 +58,7 @@ void claim_agent(char *claiming_arguments)
int exit_code;
pid_t command_pid;
char command_buffer[CLAIMING_COMMAND_LENGTH + 1];
- FILE *fp;
+ FILE *fp_child_output, *fp_child_input;
// This is guaranteed to be set early in main via post_conf_load()
char *cloud_base_url = appconfig_get(&cloud_config, CONFIG_SECTION_GLOBAL, "cloud base url", NULL);
@@ -83,14 +84,14 @@ void claim_agent(char *claiming_arguments)
claiming_arguments);
info("Executing agent claiming command 'netdata-claim.sh'");
- fp = mypopen(command_buffer, &command_pid);
- if(!fp) {
+ fp_child_output = netdata_popen(command_buffer, &command_pid, &fp_child_input);
+ if(!fp_child_output) {
error("Cannot popen(\"%s\").", command_buffer);
return;
}
info("Waiting for claiming command to finish.");
- while (fgets(command_buffer, CLAIMING_COMMAND_LENGTH, fp) != NULL) {;}
- exit_code = mypclose(fp, command_pid);
+ while (fgets(command_buffer, CLAIMING_COMMAND_LENGTH, fp_child_output) != NULL) {;}
+ exit_code = netdata_pclose(fp_child_input, fp_child_output, command_pid);
info("Agent claiming command returned with code %d", exit_code);
if (0 == exit_code) {
load_claiming_state();
@@ -169,7 +170,7 @@ void load_claiming_state(void)
}
invalidate_node_instances(&localhost->host_uuid, claimed_id ? &uuid : NULL);
- store_claim_id(&localhost->host_uuid, claimed_id ? &uuid : NULL);
+ metaqueue_store_claim_id(&localhost->host_uuid, claimed_id ? &uuid : NULL);
rrdhost_aclk_state_unlock(localhost);
if (!claimed_id) {