Fix issues in Alarm API (#11491)
* use QUEUE_IF_PAYLOAD_PRESENT in aclk_alarm_api
Timotej S committed
Sep 8, 2021 at 13:13 UTC
33136b77cfea4755794efc74fad6d57b1f644260
3 files changed
+10
-12
aclk/aclk_alarm_api.c
+2
-4
@@ -14,8 +14,7 @@ void aclk_send_alarm_log_health(struct alarm_log_health *log_health)
14
query->data.bin_payload.payload = generate_alarm_log_health(&query->data.bin_payload.size, log_health);
15
query->data.bin_payload.topic = ACLK_TOPICID_ALARM_HEALTH;
16
query->data.bin_payload.msg_name = "AlarmLogHealth";
17
- if (query->data.bin_payload.payload)
18
- aclk_queue_query(query);
17
+ QUEUE_IF_PAYLOAD_PRESENT(query);
18
}
19
20
void aclk_send_alarm_log_entry(struct alarm_log_entry *log_entry)
@@ -32,6 +31,5 @@ void aclk_send_provide_alarm_cfg(struct provide_alarm_configuration *cfg)
31
query->data.bin_payload.payload = generate_provide_alarm_configuration(&query->data.bin_payload.size, cfg);
32
query->data.bin_payload.topic = ACLK_TOPICID_ALARM_CONFIG;
33
query->data.bin_payload.msg_name = "ProvideAlarmConfiguration";
35
- if (query->data.bin_payload.payload)
36
- aclk_queue_query(query);
34
+ QUEUE_IF_PAYLOAD_PRESENT(query);
35
}
aclk/aclk_charts_api.c
-8
@@ -5,14 +5,6 @@
5
6
#define CHART_DIM_UPDATE_NAME "ChartsAndDimensionsUpdated"
7
8
-#define QUEUE_IF_PAYLOAD_PRESENT(query) \
9
- if (likely(query->data.bin_payload.payload)) { \
10
- aclk_queue_query(query); \
11
- } else { \
12
- error("Failed to generate payload (%s)", __FUNCTION__); \
13
- aclk_query_free(query); \
14
- }
15
-
8
void aclk_chart_inst_update(char **payloads, size_t *payload_sizes, struct aclk_message_position *new_positions)
9
{
10
aclk_query_t query = aclk_query_new(CHART_DIMS_UPDATE);
aclk/aclk_query_queue.h
+8
@@ -91,4 +91,12 @@ void aclk_queue_flush(void);
91
92
void aclk_queue_lock(void);
93
94
+#define QUEUE_IF_PAYLOAD_PRESENT(query) \
95
+ if (likely(query->data.bin_payload.payload)) { \
96
+ aclk_queue_query(query); \
97
+ } else { \
98
+ error("Failed to generate payload (%s)", __FUNCTION__); \
99
+ aclk_query_free(query); \
100
+ }
101
+
102
#endif /* NETDATA_ACLK_QUERY_QUEUE_H */