Skip to content

[fix] fix play and live stat bug when total_nclients is zero. #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Apr 6, 2019
Merged

[fix] fix play and live stat bug when total_nclients is zero. #98

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8640a36
Merge pull request #27 from winshining/master
plainheart Mar 11, 2019
53f331c
Merge pull request #28 from winshining/master
plainheart Mar 12, 2019
667b744
Merge pull request #29 from winshining/master
plainheart Mar 19, 2019
c8abefa
[misc] fixed a JSON stat bug and changed data type of some properties.
plainheart Mar 19, 2019
10d6b90
[dev] fix conflicting files.
plainheart Mar 29, 2019
84ad48e
[dev] update a line format.
plainheart Mar 29, 2019
f5d863a
Merge branch 'winshining-master' into fix/stat
plainheart Mar 29, 2019
5dc03b7
Merge pull request #31 from winshining/master
plainheart Apr 4, 2019
8efbea4
[fix] fix play and live stat bug when total_clients is zero.
plainheart Apr 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions ngx_rtmp_stat_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,7 @@ ngx_rtmp_stat_live(ngx_http_request_t *r, ngx_chain_t ***lll,
ngx_int_t n;
ngx_uint_t nclients, total_nclients;
ngx_uint_t f;
ngx_flag_t prev;
u_char buf[NGX_INT_T_LEN];
u_char bbuf[NGX_INT32_LEN];
ngx_rtmp_stat_loc_conf_t *slcf;
Expand All @@ -526,12 +527,13 @@ ngx_rtmp_stat_live(ngx_http_request_t *r, ngx_chain_t ***lll,
}

total_nclients = 0;
prev = 0;
for (n = 0; n < lacf->nbuckets; ++n) {
for (stream = lacf->streams[n]; stream; stream = stream->next) {
if (slcf->format & NGX_RTMP_STAT_FORMAT_XML) {
NGX_RTMP_STAT_L("<stream>\r\n");
} else {
if (total_nclients || stream->next) {
if (prev) {
NGX_RTMP_STAT_L(",");
}

Expand Down Expand Up @@ -861,6 +863,8 @@ ngx_rtmp_stat_live(ngx_http_request_t *r, ngx_chain_t ***lll,
}

NGX_RTMP_STAT_L("}");

prev = 1;
}
}
}
Expand All @@ -887,6 +891,7 @@ ngx_rtmp_stat_play(ngx_http_request_t *r, ngx_chain_t ***lll,
ngx_rtmp_play_ctx_t *ctx, *sctx;
ngx_rtmp_session_t *s;
ngx_uint_t n, nclients, total_nclients;
ngx_flag_t prev;
u_char buf[NGX_INT_T_LEN];
u_char bbuf[NGX_INT32_LEN];
ngx_rtmp_stat_loc_conf_t *slcf;
Expand All @@ -905,6 +910,7 @@ ngx_rtmp_stat_play(ngx_http_request_t *r, ngx_chain_t ***lll,
}

total_nclients = 0;
prev = 0;
for (n = 0; n < pacf->nbuckets; ++n) {
for (ctx = pacf->ctx[n]; ctx; ) {
if (slcf->format & NGX_RTMP_STAT_FORMAT_XML) {
Expand All @@ -913,7 +919,7 @@ ngx_rtmp_stat_play(ngx_http_request_t *r, ngx_chain_t ***lll,
NGX_RTMP_STAT_ECS(ctx->name);
NGX_RTMP_STAT_L("</name>\r\n");
} else {
if (total_nclients || ctx->next) {
if (prev) {
NGX_RTMP_STAT_L(",");
}

Expand Down Expand Up @@ -973,6 +979,7 @@ ngx_rtmp_stat_play(ngx_http_request_t *r, ngx_chain_t ***lll,
NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
"%ui", nclients) - buf);
NGX_RTMP_STAT_L("}");
prev = 1;
}
}
}
Expand Down