opensource/nginx-rtmp-module
1
0
Fork 0
mirror of https://github.com/arut/nginx-rtmp-module.git synced 2025-08-06 15:00:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

added uptime to statisctics

Browse Source
This commit is contained in:
Roman Arutyunyan
2012-06-22 14:07:03 +04:00
parent f48bcc5235
commit ae71903de4
2 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
ngx_rtmp_stat_module.c
View File

@ -17,6 +17,9 @@ static char * ngx_rtmp_stat_merge_loc_conf(ngx_conf_t *cf,
void *parent, void *child); void *parent, void *child);
static time_t start_time;
#define NGX_RTMP_STAT_ALL 0xff #define NGX_RTMP_STAT_ALL 0xff
#define NGX_RTMP_STAT_GLOBAL 0x01 #define NGX_RTMP_STAT_GLOBAL 0x01
#define NGX_RTMP_STAT_LIVE 0x02 #define NGX_RTMP_STAT_LIVE 0x02
@ -448,6 +451,7 @@ ngx_rtmp_stat_handler(ngx_http_request_t *r)
ngx_chain_t *cl, *l, **ll, ***lll; ngx_chain_t *cl, *l, **ll, ***lll;
size_t n; size_t n;
off_t len; off_t len;
static u_char tbuf[NGX_TIME_T_LEN + 1];
r->keepalive = 0; r->keepalive = 0;
slcf = ngx_http_get_module_loc_conf(r, ngx_rtmp_stat_module); slcf = ngx_http_get_module_loc_conf(r, ngx_rtmp_stat_module);
@ -482,6 +486,11 @@ ngx_rtmp_stat_handler(ngx_http_request_t *r)
#endif #endif
NGX_RTMP_STAT_L("<built>" __DATE__ " " __TIME__ "</built>\r\n"); NGX_RTMP_STAT_L("<built>" __DATE__ " " __TIME__ "</built>\r\n");
NGX_RTMP_STAT_L("<uptime>");
NGX_RTMP_STAT(tbuf, ngx_snprintf(tbuf, sizeof(tbuf),
"%T", ngx_cached_time->sec - start_time) - tbuf);
NGX_RTMP_STAT_L("</uptime>\r\n");
ngx_rtmp_stat_bw(r, lll, &ngx_rtmp_bw_in, &ngx_rtmp_bw_out); ngx_rtmp_stat_bw(r, lll, &ngx_rtmp_bw_in, &ngx_rtmp_bw_out);
cscf = cmcf->servers.elts; cscf = cmcf->servers.elts;
@ -512,46 +521,48 @@ error:
static void * static void *
ngx_rtmp_stat_create_loc_conf(ngx_conf_t *cf) ngx_rtmp_stat_create_loc_conf(ngx_conf_t *cf)
{ {
ngx_rtmp_stat_loc_conf_t *conf; ngx_rtmp_stat_loc_conf_t *conf;
conf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_stat_loc_conf_t)); conf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_stat_loc_conf_t));
if (conf == NULL) { if (conf == NULL) {
return NULL; return NULL;
} }
conf->stat = 0; conf->stat = 0;
return conf; return conf;
} }
static char * static char *
ngx_rtmp_stat_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_rtmp_stat_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
{ {
ngx_rtmp_stat_loc_conf_t *prev = parent; ngx_rtmp_stat_loc_conf_t *prev = parent;
ngx_rtmp_stat_loc_conf_t *conf = child; ngx_rtmp_stat_loc_conf_t *conf = child;
ngx_conf_merge_bitmask_value(conf->stat, prev->stat, 0); ngx_conf_merge_bitmask_value(conf->stat, prev->stat, 0);
ngx_conf_merge_str_value(conf->stylesheet, prev->stylesheet, ""); ngx_conf_merge_str_value(conf->stylesheet, prev->stylesheet, "");
return NGX_CONF_OK; return NGX_CONF_OK;
} }
static ngx_int_t static ngx_int_t
ngx_rtmp_stat_postconfiguration(ngx_conf_t *cf) ngx_rtmp_stat_postconfiguration(ngx_conf_t *cf)
{ {
ngx_http_handler_pt *h; ngx_http_handler_pt *h;
ngx_http_core_main_conf_t *cmcf; ngx_http_core_main_conf_t *cmcf;
cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module); cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
h = ngx_array_push(&cmcf->phases[NGX_HTTP_CONTENT_PHASE].handlers); h = ngx_array_push(&cmcf->phases[NGX_HTTP_CONTENT_PHASE].handlers);
if (h == NULL) { if (h == NULL) {
return NGX_ERROR; return NGX_ERROR;
} }
*h = ngx_rtmp_stat_handler; *h = ngx_rtmp_stat_handler;
return NGX_OK; start_time = ngx_cached_time->sec;
return NGX_OK;
} }

8
stat.xsl
View File

@ -40,6 +40,12 @@
<td><xsl:value-of select="out"/></td> <td><xsl:value-of select="out"/></td>
<td><xsl:value-of select="round(bwin div 1024)"/></td> <td><xsl:value-of select="round(bwin div 1024)"/></td>
<td><xsl:value-of select="round(bwout div 1024)"/></td> <td><xsl:value-of select="round(bwout div 1024)"/></td>
<td colspan="5"/>
<td>
<xsl:call-template name="showtime">
<xsl:with-param name="time" select="/rtmp/uptime * 1000"/>
</xsl:call-template>
</td>
</tr> </tr>
<xsl:apply-templates select="server"/> <xsl:apply-templates select="server"/>
</table> </table>
@ -130,7 +136,7 @@
<xsl:param name="time"/> <xsl:param name="time"/>
<xsl:variable name="sec"> <xsl:variable name="sec">
<xsl:value-of select="floor(time div 1000)"/> <xsl:value-of select="floor($time div 1000)"/>
</xsl:variable> </xsl:variable>
<xsl:if test="$sec &gt;= 86400"> <xsl:if test="$sec &gt;= 86400">