正在显示
1 个修改的文件
包含
4 行增加
和
4 行删除
@@ -72,8 +72,8 @@ int SrsStatisticVhost::dumps(stringstream& ss) | @@ -72,8 +72,8 @@ int SrsStatisticVhost::dumps(stringstream& ss) | ||
72 | << SRS_JFIELD_ORG("send_bytes", kbps->get_send_bytes()) << SRS_JFIELD_CONT | 72 | << SRS_JFIELD_ORG("send_bytes", kbps->get_send_bytes()) << SRS_JFIELD_CONT |
73 | << SRS_JFIELD_ORG("recv_bytes", kbps->get_recv_bytes()) << SRS_JFIELD_CONT | 73 | << SRS_JFIELD_ORG("recv_bytes", kbps->get_recv_bytes()) << SRS_JFIELD_CONT |
74 | << SRS_JFIELD_OBJ("kbps") | 74 | << SRS_JFIELD_OBJ("kbps") |
75 | - << SRS_JFIELD_ORG("r30s", kbps->get_recv_kbps_30s()) << SRS_JFIELD_CONT | ||
76 | - << SRS_JFIELD_ORG("s30s", kbps->get_send_kbps_30s()) | 75 | + << SRS_JFIELD_ORG("recv_30s", kbps->get_recv_kbps_30s()) << SRS_JFIELD_CONT |
76 | + << SRS_JFIELD_ORG("send_30s", kbps->get_send_kbps_30s()) | ||
77 | << SRS_JOBJECT_END << SRS_JFIELD_CONT | 77 | << SRS_JOBJECT_END << SRS_JFIELD_CONT |
78 | << SRS_JFIELD_NAME("hls") << SRS_JOBJECT_START | 78 | << SRS_JFIELD_NAME("hls") << SRS_JOBJECT_START |
79 | << SRS_JFIELD_BOOL("enabled", hls_enabled); | 79 | << SRS_JFIELD_BOOL("enabled", hls_enabled); |
@@ -128,8 +128,8 @@ int SrsStatisticStream::dumps(stringstream& ss) | @@ -128,8 +128,8 @@ int SrsStatisticStream::dumps(stringstream& ss) | ||
128 | << SRS_JFIELD_ORG("send_bytes", kbps->get_send_bytes()) << SRS_JFIELD_CONT | 128 | << SRS_JFIELD_ORG("send_bytes", kbps->get_send_bytes()) << SRS_JFIELD_CONT |
129 | << SRS_JFIELD_ORG("recv_bytes", kbps->get_recv_bytes()) << SRS_JFIELD_CONT | 129 | << SRS_JFIELD_ORG("recv_bytes", kbps->get_recv_bytes()) << SRS_JFIELD_CONT |
130 | << SRS_JFIELD_OBJ("kbps") | 130 | << SRS_JFIELD_OBJ("kbps") |
131 | - << SRS_JFIELD_ORG("r30s", kbps->get_recv_kbps_30s()) << SRS_JFIELD_CONT | ||
132 | - << SRS_JFIELD_ORG("s30s", kbps->get_send_kbps_30s()) | 131 | + << SRS_JFIELD_ORG("recv_30s", kbps->get_recv_kbps_30s()) << SRS_JFIELD_CONT |
132 | + << SRS_JFIELD_ORG("send_30s", kbps->get_send_kbps_30s()) | ||
133 | << SRS_JOBJECT_END << SRS_JFIELD_CONT | 133 | << SRS_JOBJECT_END << SRS_JFIELD_CONT |
134 | << SRS_JFIELD_ORG("live_ms", srs_get_system_time_ms()) << SRS_JFIELD_CONT | 134 | << SRS_JFIELD_ORG("live_ms", srs_get_system_time_ms()) << SRS_JFIELD_CONT |
135 | << SRS_JFIELD_STR("status", status) << SRS_JFIELD_CONT; | 135 | << SRS_JFIELD_STR("status", status) << SRS_JFIELD_CONT; |
-
请 注册 或 登录 后发表评论