From 73cb248f8d2876336196b7472ff818bccd261355 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Wed, 15 Jul 2020 08:48:58 -0400 Subject: [PATCH] fix statistics format when multiple transcoders are present closes #1042 Change-Id: I1dcd9c3053f35f97f0de8c23609a25347263044b --- daemon/statistics.c | 10 +++++----- t/auto-daemon-tests.pl | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/daemon/statistics.c b/daemon/statistics.c index cb35fff0b..89f7123fd 100644 --- a/daemon/statistics.c +++ b/daemon/statistics.c @@ -627,11 +627,11 @@ GQueue *statistics_gather_metrics(void) { HEADER("{", ""); METRICsva("chain", "\"%s\"", chain); METRICs("num", "%i", g_atomic_int_get(&stats_entry->num_transcoders)); - if (g_atomic_int_get(&stats_entry->last_tv_sec[idx]) != last_tv_sec) - continue; - METRICs("packetrate", UINT64F, atomic64_get(&stats_entry->packets_input[idx])); - METRICs("byterate", UINT64F, atomic64_get(&stats_entry->bytes_input[idx])); - METRICs("samplerate", UINT64F, atomic64_get(&stats_entry->pcm_samples[idx])); + if (g_atomic_int_get(&stats_entry->last_tv_sec[idx]) == last_tv_sec) { + METRICs("packetrate", UINT64F, atomic64_get(&stats_entry->packets_input[idx])); + METRICs("byterate", UINT64F, atomic64_get(&stats_entry->bytes_input[idx])); + METRICs("samplerate", UINT64F, atomic64_get(&stats_entry->pcm_samples[idx])); + } HEADER("}", ""); } diff --git a/t/auto-daemon-tests.pl b/t/auto-daemon-tests.pl index 1b0d3701a..ca1eb9d99 100755 --- a/t/auto-daemon-tests.pl +++ b/t/auto-daemon-tests.pl @@ -7490,5 +7490,9 @@ rcv($sock_b, -1, rtpm(8, $seq + 4, $ts + 160 * 4, $ssrc, $pcma_5)); +# GH 1042 + +$resp = rtpe_req('statistics', 'statistics'); + done_testing();