@cryptotaxi247 / netdata-1 / commits / a364cef58

Remove pluginsd action param & dead code. (#13928)

vkalintiris committed Nov 1, 2022 at 20:53 UTC a364cef58290bb8b699f2bf356bf086663d67002

6 files changed +45 -160

collectors/plugins.d/plugins_d.h

-4

@@ -26,10 +26,6 @@

26 #define PLUGINSD_KEYWORD_FUNCTION "FUNCTION"

27 #define PLUGINSD_KEYWORD_FUNCTION_RESULT_BEGIN "FUNCTION_RESULT_BEGIN"

28 #define PLUGINSD_KEYWORD_FUNCTION_RESULT_END "FUNCTION_RESULT_END"

29 -#define PLUGINSD_KEYWORD_GUID "GUID"

30 -#define PLUGINSD_KEYWORD_CONTEXT "CONTEXT"

31 -#define PLUGINSD_KEYWORD_TOMBSTONE "TOMBSTONE"

32 -#define PLUGINSD_KEYWORD_HOST "HOST"

30 #define PLUGINSD_KEYWORD_REPLAY_CHART "REPLAY_CHART"

31 #define PLUGINSD_KEYWORD_REPLAY_BEGIN "RBEGIN"

collectors/plugins.d/pluginsd_parser.c

+20 -115

@@ -29,7 +29,7 @@ static int send_to_plugin(const char *txt, void *data) {

29 return ret;

30 }

32 -PARSER_RC pluginsd_set(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused)

32 +PARSER_RC pluginsd_set(char **words, size_t num_words, void *user)

33 {

34 char *dimension = get_word(words, num_words, 1);

35 char *value = get_word(words, num_words, 2);

@@ -73,7 +73,7 @@ disable:

73 return PARSER_RC_ERROR;

74 }

76 -PARSER_RC pluginsd_begin(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused)

76 +PARSER_RC pluginsd_begin(char **words, size_t num_words, void *user)

77 {

78 char *id = get_word(words, num_words, 1);

79 char *microseconds_txt = get_word(words, num_words, 2);

@@ -112,7 +112,7 @@ disable:

112 return PARSER_RC_ERROR;

113 }

114

115 -PARSER_RC pluginsd_end(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused)

115 +PARSER_RC pluginsd_end(char **words, size_t num_words, void *user)

116 {

117 UNUSED(words);

118 UNUSED(num_words);

@@ -135,7 +135,7 @@ PARSER_RC pluginsd_end(char **words, size_t num_words, void *user, PLUGINSD_ACTI

135 return PARSER_RC_OK;

136 }

137

138 -PARSER_RC pluginsd_chart(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused)

138 +PARSER_RC pluginsd_chart(char **words, size_t num_words, void *user)

139 {

140 RRDHOST *host = ((PARSER_USER_OBJECT *) user)->host;

141 if (unlikely(!host && !((PARSER_USER_OBJECT *) user)->host_exists)) {

@@ -259,10 +259,8 @@ PARSER_RC pluginsd_chart(char **words, size_t num_words, void *user, PLUGINSD_AC

259 return PARSER_RC_OK;

260 }

261

262 -PARSER_RC pluginsd_chart_definition_end(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action)

262 +PARSER_RC pluginsd_chart_definition_end(char **words, size_t num_words, void *user)

263 {

264 - UNUSED(plugins_action);

265 -

264 long first_entry_child = str2l(get_word(words, num_words, 1));

265 long last_entry_child = str2l(get_word(words, num_words, 2));

266

@@ -281,7 +279,7 @@ PARSER_RC pluginsd_chart_definition_end(char **words, size_t num_words, void *us

279 return ok ? PARSER_RC_OK : PARSER_RC_ERROR;

280 }

281

284 -PARSER_RC pluginsd_dimension(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused)

282 +PARSER_RC pluginsd_dimension(char **words, size_t num_words, void *user)

283 {

284 char *id = get_word(words, num_words, 1);

285 char *name = get_word(words, num_words, 2);

@@ -511,7 +509,7 @@ static int pluginsd_execute_function_callback(BUFFER *destination_wb, int timeou

509 return HTTP_RESP_OK;

510 }

511

514 -PARSER_RC pluginsd_function(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused)

512 +PARSER_RC pluginsd_function(char **words, size_t num_words, void *user)

513 {

514 bool global = false;

515 size_t i = 1;

@@ -558,7 +556,7 @@ static void pluginsd_function_result_end(struct parser *parser, void *action_dat

556 string_freez(key);

557 }

558

561 -PARSER_RC pluginsd_function_result_begin(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused)

559 +PARSER_RC pluginsd_function_result_begin(char **words, size_t num_words, void *user)

560 {

561 char *key = get_word(words, num_words, 1);

562 char *status = get_word(words, num_words, 2);

@@ -614,7 +612,7 @@ PARSER_RC pluginsd_function_result_begin(char **words, size_t num_words, void *u

612

613 // ----------------------------------------------------------------------------

614

617 -PARSER_RC pluginsd_variable(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused)

615 +PARSER_RC pluginsd_variable(char **words, size_t num_words, void *user)

616 {

617 char *name = get_word(words, num_words, 1);

618 char *value = get_word(words, num_words, 2);

@@ -691,7 +689,7 @@ PARSER_RC pluginsd_variable(char **words, size_t num_words, void *user, PLUGINSD

689 return PARSER_RC_OK;

690 }

691

694 -PARSER_RC pluginsd_flush(char **words __maybe_unused, size_t num_words __maybe_unused, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused)

692 +PARSER_RC pluginsd_flush(char **words __maybe_unused, size_t num_words __maybe_unused, void *user)

693 {

694 debug(D_PLUGINSD, "requested a FLUSH");

695 ((PARSER_USER_OBJECT *) user)->st = NULL;

@@ -702,14 +700,14 @@ PARSER_RC pluginsd_flush(char **words __maybe_unused, size_t num_words __maybe_u

700 return PARSER_RC_OK;

701 }

702

705 -PARSER_RC pluginsd_disable(char **words __maybe_unused, size_t num_words __maybe_unused, void *user __maybe_unused, PLUGINSD_ACTION *plugins_action __maybe_unused)

703 +PARSER_RC pluginsd_disable(char **words __maybe_unused, size_t num_words __maybe_unused, void *user __maybe_unused)

704 {

705 info("called DISABLE. Disabling it.");

706 ((PARSER_USER_OBJECT *) user)->enabled = 0;

707 return PARSER_RC_ERROR;

708 }

709

712 -PARSER_RC pluginsd_label(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused)

710 +PARSER_RC pluginsd_label(char **words, size_t num_words, void *user)

711 {

712 const char *name = get_word(words, num_words, 1);

713 const char *label_source = get_word(words, num_words, 2);

@@ -761,7 +759,7 @@ PARSER_RC pluginsd_label(char **words, size_t num_words, void *user, PLUGINSD_AC

759 return PARSER_RC_OK;

760 }

761

764 -PARSER_RC pluginsd_overwrite(char **words __maybe_unused, size_t num_words __maybe_unused, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused)

762 +PARSER_RC pluginsd_overwrite(char **words __maybe_unused, size_t num_words __maybe_unused, void *user)

763 {

764 RRDHOST *host = ((PARSER_USER_OBJECT *) user)->host;

765 debug(D_PLUGINSD, "requested to OVERWRITE host labels");

@@ -778,7 +776,7 @@ PARSER_RC pluginsd_overwrite(char **words __maybe_unused, size_t num_words __may

776 }

777

778

781 -PARSER_RC pluginsd_clabel(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused)

779 +PARSER_RC pluginsd_clabel(char **words, size_t num_words, void *user)

780 {

781 const char *name = get_word(words, num_words, 1);

782 const char *value = get_word(words, num_words, 2);

@@ -800,7 +798,7 @@ PARSER_RC pluginsd_clabel(char **words, size_t num_words, void *user, PLUGINSD_A

798 return PARSER_RC_OK;

799 }

800

803 -PARSER_RC pluginsd_clabel_commit(char **words __maybe_unused, size_t num_words __maybe_unused, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused)

801 +PARSER_RC pluginsd_clabel_commit(char **words __maybe_unused, size_t num_words __maybe_unused, void *user)

802 {

803 RRDHOST *host = ((PARSER_USER_OBJECT *) user)->host;

804 RRDSET *st = ((PARSER_USER_OBJECT *)user)->st;

@@ -824,100 +822,7 @@ PARSER_RC pluginsd_clabel_commit(char **words __maybe_unused, size_t num_words _

822 return PARSER_RC_OK;

823 }

824

827 -PARSER_RC pluginsd_guid(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action)

828 -{

829 - char *uuid_str = get_word(words, num_words, 1);

830 - uuid_t uuid;

831 -

832 - if (unlikely(!uuid_str)) {

833 - error("requested a GUID, without a uuid.");

834 - return PARSER_RC_ERROR;

835 - }

836 - if (unlikely(strlen(uuid_str) != GUID_LEN || uuid_parse(uuid_str, uuid) == -1)) {

837 - error("requested a GUID, without a valid uuid string.");

838 - return PARSER_RC_ERROR;

839 - }

840 -

841 - debug(D_PLUGINSD, "Parsed uuid=%s", uuid_str);

842 - if (plugins_action->guid_action) {

843 - return plugins_action->guid_action(user, &uuid);

844 - }

845 -

846 - return PARSER_RC_OK;

847 -}

848 -

849 -PARSER_RC pluginsd_context(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action)

850 -{

851 - char *uuid_str = get_word(words, num_words, 1);

852 - uuid_t uuid;

853 -

854 - if (unlikely(!uuid_str)) {

855 - error("requested a CONTEXT, without a uuid.");

856 - return PARSER_RC_ERROR;

857 - }

858 - if (unlikely(strlen(uuid_str) != GUID_LEN || uuid_parse(uuid_str, uuid) == -1)) {

859 - error("requested a CONTEXT, without a valid uuid string.");

860 - return PARSER_RC_ERROR;

861 - }

862 -

863 - debug(D_PLUGINSD, "Parsed uuid=%s", uuid_str);

864 - if (plugins_action->context_action) {

865 - return plugins_action->context_action(user, &uuid);

866 - }

867 -

868 - return PARSER_RC_OK;

869 -}

870 -

871 -PARSER_RC pluginsd_tombstone(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action)

872 -{

873 - char *uuid_str = get_word(words, num_words, 1);

874 - uuid_t uuid;

875 -

876 - if (unlikely(!uuid_str)) {

877 - error("requested a TOMBSTONE, without a uuid.");

878 - return PARSER_RC_ERROR;

879 - }

880 - if (unlikely(strlen(uuid_str) != GUID_LEN || uuid_parse(uuid_str, uuid) == -1)) {

881 - error("requested a TOMBSTONE, without a valid uuid string.");

882 - return PARSER_RC_ERROR;

883 - }

884 -

885 - debug(D_PLUGINSD, "Parsed uuid=%s", uuid_str);

886 - if (plugins_action->tombstone_action) {

887 - return plugins_action->tombstone_action(user, &uuid);

888 - }

889 -

890 - return PARSER_RC_OK;

891 -}

892 -

893 -PARSER_RC metalog_pluginsd_host(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action)

894 -{

895 - char *machine_guid = get_word(words, num_words, 1);

896 - char *hostname = get_word(words, num_words, 2);

897 - char *registry_hostname = get_word(words, num_words, 3);

898 - char *update_every_s = get_word(words, num_words, 4);

899 - char *os = get_word(words, num_words, 5);

900 - char *timezone = get_word(words, num_words, 6);

901 - char *tags = get_word(words, num_words, 7);

902 -

903 - int update_every = 1;

904 - if (likely(update_every_s && *update_every_s))

905 - update_every = str2i(update_every_s);

906 - if (unlikely(!update_every))

907 - update_every = 1;

908 -

909 - debug(D_PLUGINSD, "HOST PARSED: guid=%s, hostname=%s, reg_host=%s, update=%d, os=%s, timezone=%s, tags=%s",

910 - machine_guid, hostname, registry_hostname, update_every, os, timezone, tags);

911 -

912 - if (plugins_action->host_action) {

913 - return plugins_action->host_action(

914 - user, machine_guid, hostname, registry_hostname, update_every, os, timezone, tags);

915 - }

916 -

917 - return PARSER_RC_OK;

918 -}

919 -

920 -PARSER_RC pluginsd_replay_rrdset_begin(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused)

825 +PARSER_RC pluginsd_replay_rrdset_begin(char **words, size_t num_words, void *user)

826 {

827 char *id = get_word(words, num_words, 1);

828 char *start_time_str = get_word(words, num_words, 2);

@@ -988,7 +893,7 @@ disable:

893 return PARSER_RC_ERROR;

894 }

895

991 -PARSER_RC pluginsd_replay_set(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused)

896 +PARSER_RC pluginsd_replay_set(char **words, size_t num_words, void *user)

897 {

898 char *dimension = get_word(words, num_words, 1);

899 char *value_str = get_word(words, num_words, 2);

@@ -1084,7 +989,7 @@ disable:

989 return PARSER_RC_ERROR;

990 }

991

1087 -PARSER_RC pluginsd_replay_rrddim_collection_state(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused)

992 +PARSER_RC pluginsd_replay_rrddim_collection_state(char **words, size_t num_words, void *user)

993 {

994 char *dimension = get_word(words, num_words, 1);

995 char *last_collected_ut_str = get_word(words, num_words, 2);

@@ -1133,7 +1038,7 @@ disable:

1038 return PARSER_RC_ERROR;

1039 }

1040

1136 -PARSER_RC pluginsd_replay_rrdset_collection_state(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused)

1041 +PARSER_RC pluginsd_replay_rrdset_collection_state(char **words, size_t num_words, void *user)

1042 {

1043 char *last_collected_ut_str = get_word(words, num_words, 1);

1044 char *last_updated_ut_str = get_word(words, num_words, 2);

@@ -1176,7 +1081,7 @@ disable:

1081 return PARSER_RC_ERROR;

1082 }

1083

1179 -PARSER_RC pluginsd_replay_end(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action __maybe_unused)

1084 +PARSER_RC pluginsd_replay_end(char **words, size_t num_words, void *user)

1085 {

1086 if (num_words < 7) {

1087 error("REPLAY: malformed " PLUGINSD_KEYWORD_REPLAY_END " command");

collectors/plugins.d/pluginsd_parser.h

+2 -2

@@ -29,7 +29,7 @@ typedef struct parser_user_object {

29 } replay;

30 } PARSER_USER_OBJECT;

32 -PARSER_RC pluginsd_function(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

33 -PARSER_RC pluginsd_function_result_begin(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

32 +PARSER_RC pluginsd_function(char **words, size_t num_words, void *user);

33 +PARSER_RC pluginsd_function_result_begin(char **words, size_t num_words, void *user);

34 void inflight_functions_init(PARSER *parser);

35 #endif //NETDATA_PLUGINSD_PARSER_H

parser/parser.c

+2 -4

@@ -34,7 +34,6 @@ PARSER *parser_init(RRDHOST *host, void *user, void *input, void *output, PARSER

34 PARSER *parser;

36 parser = callocz(1, sizeof(*parser));

37 - parser->plugins_action = callocz(1, sizeof(PLUGINSD_ACTION));

37 parser->user = user;

38 parser->input = input;

39 parser->output = output;

@@ -194,7 +193,6 @@ void parser_destroy(PARSER *parser)

193 tmp_parser_data = tmp_parser_data_next;

194 }

195

197 - freez(parser->plugins_action);

196 freez(parser);

197 }

198

@@ -334,7 +332,7 @@ inline int parser_action(PARSER *parser, char *input)

332

333 if (unlikely(!action_function_list)) {

334 if (unlikely(parser->unknown_function))

337 - rc = parser->unknown_function(words, num_words, parser->user, NULL);

335 + rc = parser->unknown_function(words, num_words, parser->user);

336 else

337 rc = PARSER_RC_ERROR;

338

@@ -343,7 +341,7 @@ inline int parser_action(PARSER *parser, char *input)

341 else {

342 worker_is_busy(worker_job_id);

343 while ((action_function = *action_function_list) != NULL) {

346 - rc = action_function(words, num_words, parser->user, parser->plugins_action);

344 + rc = action_function(words, num_words, parser->user);

345 if (unlikely(rc == PARSER_RC_ERROR || rc == PARSER_RC_STOP)) {

346 internal_error(true, "action_function() failed with rc = %u", rc);

347 break;

parser/parser.h

+20 -32

@@ -16,14 +16,6 @@ typedef enum parser_rc {

16 PARSER_RC_ERROR // Callback failed (abort rest of callbacks)

17 } PARSER_RC;

19 -typedef struct pluginsd_action {

20 - PARSER_RC (*guid_action)(void *user, uuid_t *uuid);

21 - PARSER_RC (*context_action)(void *user, uuid_t *uuid);

22 - PARSER_RC (*tombstone_action)(void *user, uuid_t *uuid);

23 - PARSER_RC (*host_action)(void *user, char *machine_guid, char *hostname, char *registry_hostname, int update_every, char *os,

24 - char *timezone, char *tags);

25 -} PLUGINSD_ACTION;

26 -

19 typedef enum parser_input_type {

20 PARSER_INPUT_SPLIT = (1 << 1),

21 PARSER_INPUT_KEEP_ORIGINAL = (1 << 2),

@@ -35,7 +27,7 @@ typedef enum parser_input_type {

28 #define PARSER_INPUT_FULL (PARSER_INPUT_SPLIT|PARSER_INPUT_ORIGINAL)

38 -typedef PARSER_RC (*keyword_function)(char **words, size_t num_words, void *user_data, PLUGINSD_ACTION *plugins_action);

30 +typedef PARSER_RC (*keyword_function)(char **words, size_t num_words, void *user_data);

32 typedef struct parser_keyword {

33 size_t worker_job_id;

@@ -62,7 +54,6 @@ typedef struct parser {

54 #endif

55 PARSER_DATA *data; // extra input

56 PARSER_KEYWORD *keyword; // List of parse keywords and functions

65 - PLUGINSD_ACTION *plugins_action;

57 void *user; // User defined structure to hold extra state between calls

58 uint32_t flags;

@@ -104,27 +95,24 @@ int parser_recover_input(PARSER *working_parser);

96 size_t pluginsd_process(RRDHOST *host, struct plugind *cd, FILE *fp_plugin_input, FILE *fp_plugin_output, int trust_durations);

107 -PARSER_RC pluginsd_set(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

108 -PARSER_RC pluginsd_begin(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

109 -PARSER_RC pluginsd_end(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

110 -PARSER_RC pluginsd_chart(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

111 -PARSER_RC pluginsd_chart_definition_end(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

112 -PARSER_RC pluginsd_dimension(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

113 -PARSER_RC pluginsd_variable(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

114 -PARSER_RC pluginsd_flush(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

115 -PARSER_RC pluginsd_disable(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

116 -PARSER_RC pluginsd_label(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

117 -PARSER_RC pluginsd_overwrite(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

118 -PARSER_RC pluginsd_guid(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

119 -PARSER_RC pluginsd_context(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

120 -PARSER_RC pluginsd_tombstone(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

121 -PARSER_RC pluginsd_clabel_commit(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

122 -PARSER_RC pluginsd_clabel(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

123 -

124 -PARSER_RC pluginsd_replay_rrdset_begin(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

125 -PARSER_RC pluginsd_replay_rrddim_collection_state(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

126 -PARSER_RC pluginsd_replay_rrdset_collection_state(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

127 -PARSER_RC pluginsd_replay_set(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

128 -PARSER_RC pluginsd_replay_end(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action);

98 +PARSER_RC pluginsd_set(char **words, size_t num_words, void *user);

99 +PARSER_RC pluginsd_begin(char **words, size_t num_words, void *user);

100 +PARSER_RC pluginsd_end(char **words, size_t num_words, void *user);

101 +PARSER_RC pluginsd_chart(char **words, size_t num_words, void *user);

102 +PARSER_RC pluginsd_chart_definition_end(char **words, size_t num_words, void *user);

103 +PARSER_RC pluginsd_dimension(char **words, size_t num_words, void *user);

104 +PARSER_RC pluginsd_variable(char **words, size_t num_words, void *user);

105 +PARSER_RC pluginsd_flush(char **words, size_t num_words, void *user);

106 +PARSER_RC pluginsd_disable(char **words, size_t num_words, void *user);

107 +PARSER_RC pluginsd_label(char **words, size_t num_words, void *user);

108 +PARSER_RC pluginsd_overwrite(char **words, size_t num_words, void *user);

109 +PARSER_RC pluginsd_clabel_commit(char **words, size_t num_words, void *user);

110 +PARSER_RC pluginsd_clabel(char **words, size_t num_words, void *user);

111 +

112 +PARSER_RC pluginsd_replay_rrdset_begin(char **words, size_t num_words, void *user);

113 +PARSER_RC pluginsd_replay_rrddim_collection_state(char **words, size_t num_words, void *user);

114 +PARSER_RC pluginsd_replay_rrdset_collection_state(char **words, size_t num_words, void *user);

115 +PARSER_RC pluginsd_replay_set(char **words, size_t num_words, void *user);

116 +PARSER_RC pluginsd_replay_end(char **words, size_t num_words, void *user);

117

118 #endif

streaming/receiver.c

+1 -3

@@ -65,10 +65,8 @@ static void rrdpush_receiver_thread_cleanup(void *ptr) {

66 #include "collectors/plugins.d/pluginsd_parser.h"

68 -PARSER_RC streaming_claimed_id(char **words, size_t num_words, void *user, PLUGINSD_ACTION *plugins_action)

68 +PARSER_RC streaming_claimed_id(char **words, size_t num_words, void *user)

69 {

70 - UNUSED(plugins_action);

71 -

70 const char *host_uuid_str = get_word(words, num_words, 1);

71 const char *claim_id_str = get_word(words, num_words, 2);