Skip to content

Commit 2d64d6e

Browse files
reletrelet
committed
use add_default_fields in all message types
1 parent 9cd88da commit 2d64d6e

File tree

1 file changed

+50
-37
lines changed

1 file changed

+50
-37
lines changed

‎metadata_writer_zeromq.c‎

Lines changed: 50 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,20 @@ static json_object *md_zeromq_create_json_double(json_object *obj,
108108
static uint8_t md_zeromq_add_default_fields(const struct md_writer_zeromq *mwz,
109109
struct json_object* obj, int seq, int64_t tstamp, const char* dataid) {
110110
if (!md_zeromq_create_json_int(obj, mwz->keys[MD_ZMQ_KEY_SEQ],
111-
seq) ||
111+
seq)) {
112+
return 0;
113+
}
114+
if ((mwz->metadata_project == MD_PROJECT_NNE) &&
112115
!md_zeromq_create_json_int64(obj, mwz->keys[MD_ZMQ_KEY_TSTAMP],
113-
tstamp) ||
114-
(mwz->keys[MD_ZMQ_KEY_DATAVERSION] &&
116+
tstamp)) {
117+
return 0;
118+
} else
119+
if ((mwz->metadata_project == MD_PROJECT_MNR) &&
120+
!md_zeromq_create_json_double(obj, mwz->keys[MD_ZMQ_KEY_TSTAMP],
121+
override_tstamp())) {
122+
return 0;
123+
}
124+
if ((mwz->keys[MD_ZMQ_KEY_DATAVERSION] &&
115125
!md_zeromq_create_json_int(obj, mwz->keys[MD_ZMQ_KEY_DATAVERSION],
116126
MD_ZMQ_DATA_VERSION)) ||
117127
(mwz->keys[MD_ZMQ_KEY_DATAID] &&
@@ -201,8 +211,7 @@ static void md_zeromq_handle_munin(struct md_writer_zeromq *mwz,
201211
mwz->topics[MD_ZMQ_TOPIC_SENSOR], key);
202212
if (retval >= sizeof(dataid)) continue;
203213

204-
md_zeromq_add_default_fields(mwz, val, mge->sequence, mge->tstamp,
205-
dataid);
214+
md_zeromq_add_default_fields(mwz, val, mge->sequence, mge->tstamp, dataid);
206215

207216
retval = snprintf(topic, sizeof(topic), "%s.%s %s",
208217
mwz->topics[MD_ZMQ_TOPIC_SENSOR],
@@ -221,7 +230,7 @@ static void md_zeromq_handle_sysevent(struct md_writer_zeromq *mwz,
221230
int retval;
222231

223232
md_zeromq_add_default_fields(mwz, mge->json_blob, mge->sequence,
224-
mge->tstamp, mwz->topics[MD_ZMQ_TOPIC_SYSEVENT]);
233+
mge->tstamp, mwz->topics[MD_ZMQ_TOPIC_SYSEVENT]);
225234

226235
retval = snprintf(topic, sizeof(topic), "%s %s",
227236
mwz->topics[MD_ZMQ_TOPIC_SYSEVENT],
@@ -378,11 +387,7 @@ static json_object *md_zeromq_create_iface_json(const struct md_writer_zeromq *m
378387
}
379388
}
380389

381-
if (!md_zeromq_create_json_int(obj, mwz->keys[MD_ZMQ_KEY_SEQ],
382-
mie->sequence) ||
383-
!md_zeromq_create_json_int64(obj, mwz->keys[MD_ZMQ_KEY_TSTAMP],
384-
mie->tstamp) ||
385-
!md_zeromq_create_json_string(obj, mwz->keys[MD_ZMQ_KEY_ICCID],
390+
if (!md_zeromq_create_json_string(obj, mwz->keys[MD_ZMQ_KEY_ICCID],
386391
mie->iccid) ||
387392
!md_zeromq_create_json_string(obj, mwz->keys[MD_ZMQ_KEY_IMSI],
388393
mie->imsi) ||
@@ -549,6 +554,12 @@ static json_object *md_zeromq_handle_radio_cell_loc_gerant(
549554
if (!(obj = json_object_new_object()))
550555
return NULL;
551556

557+
if (!md_zeromq_add_default_fields(mwz, obj, event->sequence,
558+
event->tstamp, mwz->topics[MD_ZMQ_TOPIC_RADIO_CELL_LOCATION_GERAN])) {
559+
json_object_put(obj);
560+
return NULL;
561+
}
562+
552563
if (event->iccid &&
553564
!md_zeromq_create_json_string(obj, mwz->keys[MD_ZMQ_KEY_ICCID],
554565
event->iccid)) {
@@ -570,11 +581,7 @@ static json_object *md_zeromq_handle_radio_cell_loc_gerant(
570581
return NULL;
571582
}
572583

573-
if (!md_zeromq_create_json_int(obj, mwz->keys[MD_ZMQ_KEY_SEQ],
574-
event->sequence) ||
575-
!md_zeromq_create_json_int64(obj, mwz->keys[MD_ZMQ_KEY_TSTAMP],
576-
override_tstamp()) ||
577-
!md_zeromq_create_json_int64(obj, mwz->keys[MD_ZMQ_KEY_RADIO_CELL_ID],
584+
if (!md_zeromq_create_json_int64(obj, mwz->keys[MD_ZMQ_KEY_RADIO_CELL_ID],
578585
event->cell_id) ||
579586
!md_zeromq_create_json_string(obj, mwz->keys[MD_ZMQ_KEY_RADIO_PLMN],
580587
event->plmn) ||
@@ -640,11 +647,13 @@ static json_object *md_zeromq_handle_radio_cell_resel_event(
640647
return NULL;
641648
}
642649

643-
if (!md_zeromq_create_json_int(obj, mwz->keys[MD_ZMQ_KEY_SEQ],
644-
event->sequence) ||
645-
!md_zeromq_create_json_int64(obj, mwz->keys[MD_ZMQ_KEY_TSTAMP],
646-
event->tstamp) ||
647-
!md_zeromq_create_json_int(obj,
650+
if (!md_zeromq_add_default_fields(mwz, obj, event->sequence,
651+
event->tstamp, mwz->topics[MD_ZMQ_TOPIC_RADIO_GRR_CELL_RESEL])) {
652+
json_object_put(obj);
653+
return NULL;
654+
}
655+
656+
if (!md_zeromq_create_json_int(obj,
648657
mwz->keys[MD_ZMQ_KEY_RADIO_SERVING_BCCH_ARFCN],
649658
event->serving_bcch_arfcn) ||
650659
!md_zeromq_create_json_int(obj,
@@ -726,11 +735,13 @@ static json_object *md_zeromq_handle_radio_cipher_mode_event(
726735
return NULL;
727736
}
728737

729-
if (!md_zeromq_create_json_int(obj, mwz->keys[MD_ZMQ_KEY_SEQ],
730-
event->sequence) ||
731-
!md_zeromq_create_json_int64(obj, mwz->keys[MD_ZMQ_KEY_TSTAMP],
732-
event->tstamp) ||
733-
!md_zeromq_create_json_int(obj,
738+
if (!md_zeromq_add_default_fields(mwz, obj, event->sequence,
739+
event->tstamp, mwz->topics[MD_ZMQ_TOPIC_RADIO_GSM_RR_CIPHER_MODE])) {
740+
json_object_put(obj);
741+
return NULL;
742+
}
743+
744+
if (!md_zeromq_create_json_int(obj,
734745
mwz->keys[MD_ZMQ_KEY_RADIO_CIPHERING_STATE],
735746
event->ciphering_state) ||
736747
!md_zeromq_create_json_int(obj,
@@ -771,13 +782,15 @@ static json_object *md_zeromq_handle_cell_reset_param_event(
771782
event->imei)) {
772783
json_object_put(obj);
773784
return NULL;
785+
}
786+
787+
if (!md_zeromq_add_default_fields(mwz, obj, event->sequence,
788+
event->tstamp, mwz->topics[MD_ZMQ_TOPIC_RADIO_GSM_RR_CELL_SEL_RESEL_PARAM])) {
789+
json_object_put(obj);
790+
return NULL;
774791
}
775792

776-
if (!md_zeromq_create_json_int(obj, mwz->keys[MD_ZMQ_KEY_SEQ],
777-
event->sequence) ||
778-
!md_zeromq_create_json_int64(obj, mwz->keys[MD_ZMQ_KEY_TSTAMP],
779-
event->tstamp) ||
780-
!md_zeromq_create_json_int(obj,
793+
if (!md_zeromq_create_json_int(obj,
781794
mwz->keys[MD_ZMQ_KEY_RADIO_CELL_RESELECT_HYSTERESIS],
782795
event->cell_reselect_hysteresis) ||
783796
!md_zeromq_create_json_int(obj,
@@ -850,13 +863,13 @@ static json_object *md_zeromq_handle_rr_channel_conf_event(
850863
return NULL;
851864
}
852865

866+
if (!md_zeromq_add_default_fields(mwz, obj, event->sequence,
867+
event->tstamp, mwz->topics[MD_ZMQ_TOPIC_RADIO_GSM_RR_CHANNEL_CONF])) {
868+
json_object_put(obj);
869+
return NULL;
870+
}
871+
853872
if (!md_zeromq_create_json_int(obj,
854-
mwz->keys[MD_ZMQ_KEY_SEQ],
855-
event->sequence) ||
856-
!md_zeromq_create_json_int64(obj,
857-
mwz->keys[MD_ZMQ_KEY_TSTAMP],
858-
event->tstamp) ||
859-
!md_zeromq_create_json_int(obj,
860873
mwz->keys[MD_ZMQ_KEY_RADIO_NUM_DED_CHANS],
861874
event->num_ded_chans) ||
862875
!md_zeromq_create_json_int(obj,

0 commit comments

Comments
 (0)