Browse Source

fix statistics format when multiple transcoders are present

closes #1042

Change-Id: I1dcd9c3053f35f97f0de8c23609a25347263044b
changes/47/41847/1
Richard Fuchs 5 years ago
parent
commit
73cb248f8d
2 changed files with 9 additions and 5 deletions
  1. +5
    -5
      daemon/statistics.c
  2. +4
    -0
      t/auto-daemon-tests.pl

+ 5
- 5
daemon/statistics.c View File

@ -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("}", "");
}


+ 4
- 0
t/auto-daemon-tests.pl View File

@ -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();

Loading…
Cancel
Save