From f4b29b0547a754e0f2f9cf02aae75d5ee9ee8211 Mon Sep 17 00:00:00 2001 From: Roman Arutyunyan Date: Sat, 2 Feb 2013 22:18:19 +0400 Subject: [PATCH] added naccepted value to stat --- ngx_rtmp.h | 3 +++ ngx_rtmp_handler.c | 3 +++ ngx_rtmp_init.c | 1 + ngx_rtmp_stat_module.c | 5 +++++ stat.xsl | 3 ++- 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ngx_rtmp.h b/ngx_rtmp.h index 814ef59..f069490 100644 --- a/ngx_rtmp.h +++ b/ngx_rtmp.h @@ -577,6 +577,9 @@ extern ngx_rtmp_bandwidth_t ngx_rtmp_bw_out; extern ngx_rtmp_bandwidth_t ngx_rtmp_bw_in; +extern ngx_uint_t ngx_rtmp_naccepted; + + extern ngx_uint_t ngx_rtmp_max_module; extern ngx_module_t ngx_rtmp_core_module; diff --git a/ngx_rtmp_handler.c b/ngx_rtmp_handler.c index b0ede42..20caf21 100644 --- a/ngx_rtmp_handler.c +++ b/ngx_rtmp_handler.c @@ -13,6 +13,9 @@ static void ngx_rtmp_ping(ngx_event_t *rev); static ngx_int_t ngx_rtmp_finalize_set_chunk_size(ngx_rtmp_session_t *s); +ngx_uint_t ngx_rtmp_naccepted; + + ngx_rtmp_bandwidth_t ngx_rtmp_bw_out; ngx_rtmp_bandwidth_t ngx_rtmp_bw_in; diff --git a/ngx_rtmp_init.c b/ngx_rtmp_init.c index 46141de..46b46ad 100644 --- a/ngx_rtmp_init.c +++ b/ngx_rtmp_init.c @@ -26,6 +26,7 @@ ngx_rtmp_init_connection(ngx_connection_t *c) ngx_rtmp_in6_addr_t *addr6; #endif + ++ngx_rtmp_naccepted; /* find the server configuration for the address:port */ diff --git a/ngx_rtmp_stat_module.c b/ngx_rtmp_stat_module.c index 6951d4f..4c68298 100644 --- a/ngx_rtmp_stat_module.c +++ b/ngx_rtmp_stat_module.c @@ -578,6 +578,11 @@ ngx_rtmp_stat_handler(ngx_http_request_t *r) "%T", ngx_cached_time->sec - start_time) - tbuf); NGX_RTMP_STAT_L("\r\n"); + NGX_RTMP_STAT_L(""); + NGX_RTMP_STAT(nbuf, ngx_snprintf(nbuf, sizeof(nbuf), + "%ui", ngx_rtmp_naccepted) - nbuf); + NGX_RTMP_STAT_L("\r\n"); + ngx_rtmp_stat_bw(r, lll, &ngx_rtmp_bw_in, &ngx_rtmp_bw_out); cscf = cmcf->servers.elts; diff --git a/stat.xsl b/stat.xsl index 25f288e..dfc9939 100644 --- a/stat.xsl +++ b/stat.xsl @@ -36,7 +36,8 @@ Time - + @ +