external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

add config item for the stat disk device name

Browse source
This commit is contained in:
winlin 2014-07-27 16:52:00 +08:00
parent 7c1dd97513
commit b334021836
5 changed files with 73 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
trunk/src/utest/srs_utest_config.cpp
View file

@ -156,6 +156,9 @@ std::string __full_conf = ""
" # we may retrieve more than one network device. \n"
" # default: 0 \n"
" network_device_index 0; \n"
" # the device name to stat the disk iops. \n"
" # ignore the device of /proc/diskstats if not configed. \n"
" disk_device_name sda sdb xvda xvdb; \n"
"} \n"
" \n"
"############################################################################################# \n"
@ -1839,8 +1842,11 @@ VOID TEST(ConfigMainTest, ParseFullConf)
EXPECT_EQ(9300, conf.get_heartbeat_interval());
EXPECT_STREQ("http://127.0.0.1:8085/api/v1/servers", conf.get_heartbeat_url().c_str());
EXPECT_STREQ("my-srs-device", conf.get_heartbeat_device_id().c_str());
EXPECT_EQ(0, conf.get_stats_network_device_index());
EXPECT_FALSE(conf.get_heartbeat_summaries());
EXPECT_EQ(0, conf.get_stats_network_device_index());
ASSERT_TRUE(conf.get_stats_disk_device() != NULL);
EXPECT_EQ(4, (int)conf.get_stats_disk_device()->args.size());
EXPECT_TRUE(conf.get_http_api_enabled());
EXPECT_EQ(1985, conf.get_http_api_listen());
@ -4633,6 +4639,16 @@ VOID TEST(ConfigMainTest, CheckConf_stats)
MockSrsConfig conf;
EXPECT_TRUE(ERROR_SUCCESS != conf.parse(_MIN_OK_CONF"stats{network_device_index -1;}"));
}
if (true) {
MockSrsConfig conf;
EXPECT_TRUE(ERROR_SUCCESS == conf.parse(_MIN_OK_CONF"stats{disk_device_name sda;}"));
}
if (true) {
MockSrsConfig conf;
EXPECT_TRUE(ERROR_SUCCESS != conf.parse(_MIN_OK_CONF"stats{disk_device_names sda;}"));
}
}
VOID TEST(ConfigMainTest, CheckConf_http_stream)