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

rename network_device_index to network

Browse source
This commit is contained in:
winlin 2014-07-27 18:39:20 +08:00
parent b8ae5c63fc
commit f4ea48adcb
6 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/conf/full.conf
View file

@ -48,7 +48,7 @@ daemon on;
############################################################################################# #############################################################################################
# heartbeat to api server # heartbeat to api server
# @remark, the ip report to server, is retrieve from system stat, # @remark, the ip report to server, is retrieve from system stat,
# which need the config item stats.network_device_index. # which need the config item stats.network.
heartbeat { heartbeat {
# whether heartbeat is enalbed. # whether heartbeat is enalbed.
# default: off # default: off
@ -81,13 +81,13 @@ heartbeat {
# the main cycle will retrieve the system stat, # the main cycle will retrieve the system stat,
# for example, the cpu/mem/network/disk-io data, # for example, the cpu/mem/network/disk-io data,
# the http api, for instance, /api/v1/summaries will show these data. # the http api, for instance, /api/v1/summaries will show these data.
# @remark the heartbeat depends on the network_device_index, # @remark the heartbeat depends on the network,
# for example, the eth0 maybe the device which index is 0. # for example, the eth0 maybe the device which index is 0.
stats { stats {
# the index of device ip. # the index of device ip.
# we may retrieve more than one network device. # we may retrieve more than one network device.
# default: 0 # default: 0
network_device_index 0; network 0;
# the device name to stat the disk iops. # the device name to stat the disk iops.
# ignore the device of /proc/diskstats if not configed. # ignore the device of /proc/diskstats if not configed.
disk_device_name sda sdb xvda xvdb; disk_device_name sda sdb xvda xvdb;

2
trunk/conf/http.heartbeat.conf
View file

@ -11,7 +11,7 @@ heartbeat {
summaries on; summaries on;
} }
stats { stats {
network_device_index 0; network 0;
} }
vhost __defaultVhost__ { vhost __defaultVhost__ {
} }

12
trunk/src/app/srs_app_config.cpp
View file

@ -1249,7 +1249,7 @@ int SrsConfig::check_config()
SrsConfDirective* conf = get_stats(); SrsConfDirective* conf = get_stats();
for (int i = 0; conf && i < (int)conf->directives.size(); i++) { for (int i = 0; conf && i < (int)conf->directives.size(); i++) {
string n = conf->at(i)->name; string n = conf->at(i)->name;
if (n != "network_device_index" && n != "disk_device_name") { if (n != "network" && n != "disk_device_name") {
ret = ERROR_SYSTEM_CONFIG_INVALID; ret = ERROR_SYSTEM_CONFIG_INVALID;
srs_error("unsupported stats directive %s, ret=%d", n.c_str(), ret); srs_error("unsupported stats directive %s, ret=%d", n.c_str(), ret);
return ret; return ret;
@ -1442,10 +1442,10 @@ int SrsConfig::check_config()
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// check stats // check stats
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
if (get_stats_network_device_index() < 0) { if (get_stats_network() < 0) {
ret = ERROR_SYSTEM_CONFIG_INVALID; ret = ERROR_SYSTEM_CONFIG_INVALID;
srs_error("directive stats network_device_index invalid, network_device_index=%d, ret=%d", srs_error("directive stats network invalid, network=%d, ret=%d",
get_stats_network_device_index(), ret); get_stats_network(), ret);
return ret; return ret;
} }
@ -3178,7 +3178,7 @@ SrsConfDirective* SrsConfig::get_stats()
return root->get("stats"); return root->get("stats");
} }
int SrsConfig::get_stats_network_device_index() int SrsConfig::get_stats_network()
{ {
SrsConfDirective* conf = get_stats(); SrsConfDirective* conf = get_stats();
@ -3186,7 +3186,7 @@ int SrsConfig::get_stats_network_device_index()
return SRS_CONF_DEFAULT_STATS_NETWORK_DEVICE_INDEX; return SRS_CONF_DEFAULT_STATS_NETWORK_DEVICE_INDEX;
} }
conf = conf->get("network_device_index"); conf = conf->get("network");
if (!conf || conf->arg0().empty()) { if (!conf || conf->arg0().empty()) {
return SRS_CONF_DEFAULT_STATS_NETWORK_DEVICE_INDEX; return SRS_CONF_DEFAULT_STATS_NETWORK_DEVICE_INDEX;
} }

2
trunk/src/app/srs_app_config.hpp
View file

@ -942,7 +942,7 @@ public:
* for heartbeat to report to server, or to get the local ip. * for heartbeat to report to server, or to get the local ip.
* for example, 0 means the eth0 maybe. * for example, 0 means the eth0 maybe.
*/ */
virtual int get_stats_network_device_index(); virtual int get_stats_network();
/** /**
* get the disk stat device name list. * get the disk stat device name list.
* the device name configed in args of directive. * the device name configed in args of directive.

2
trunk/src/app/srs_app_heartbeat.cpp
View file

@ -61,7 +61,7 @@ void SrsHttpHeartbeat::heartbeat()
vector<string>& ips = srs_get_local_ipv4_ips(); vector<string>& ips = srs_get_local_ipv4_ips();
if (!ips.empty()) { if (!ips.empty()) {
ip = ips[_srs_config->get_stats_network_device_index() % (int)ips.size()]; ip = ips[_srs_config->get_stats_network() % (int)ips.size()];
} }
std::stringstream ss; std::stringstream ss;

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

@ -149,13 +149,13 @@ std::string __full_conf = ""
"# the main cycle will retrieve the system stat, \n" "# the main cycle will retrieve the system stat, \n"
"# for example, the cpu/mem/network/disk-io data, \n" "# for example, the cpu/mem/network/disk-io data, \n"
"# the http api, for instance, /api/v1/summaries will show these data. \n" "# the http api, for instance, /api/v1/summaries will show these data. \n"
"# @remark the heartbeat depends on the network_device_index, \n" "# @remark the heartbeat depends on the network, \n"
"# for example, the eth0 maybe the device which index is 0. \n" "# for example, the eth0 maybe the device which index is 0. \n"
"stats { \n" "stats { \n"
" # the index of device ip. \n" " # the index of device ip. \n"
" # we may retrieve more than one network device. \n" " # we may retrieve more than one network device. \n"
" # default: 0 \n" " # default: 0 \n"
" network_device_index 0; \n" " network 0; \n"
" # the device name to stat the disk iops. \n" " # the device name to stat the disk iops. \n"
" # ignore the device of /proc/diskstats if not configed. \n" " # ignore the device of /proc/diskstats if not configed. \n"
" disk_device_name sda sdb xvda xvdb; \n" " disk_device_name sda sdb xvda xvdb; \n"
@ -1844,7 +1844,7 @@ VOID TEST(ConfigMainTest, ParseFullConf)
EXPECT_STREQ("my-srs-device", conf.get_heartbeat_device_id().c_str()); EXPECT_STREQ("my-srs-device", conf.get_heartbeat_device_id().c_str());
EXPECT_FALSE(conf.get_heartbeat_summaries()); EXPECT_FALSE(conf.get_heartbeat_summaries());
EXPECT_EQ(0, conf.get_stats_network_device_index()); EXPECT_EQ(0, conf.get_stats_network());
ASSERT_TRUE(conf.get_stats_disk_device() != NULL); ASSERT_TRUE(conf.get_stats_disk_device() != NULL);
EXPECT_EQ(4, (int)conf.get_stats_disk_device()->args.size()); EXPECT_EQ(4, (int)conf.get_stats_disk_device()->args.size());
@ -4622,22 +4622,22 @@ VOID TEST(ConfigMainTest, CheckConf_stats)
if (true) { if (true) {
MockSrsConfig conf; MockSrsConfig conf;
EXPECT_TRUE(ERROR_SUCCESS == conf.parse(_MIN_OK_CONF"stats{network_device_index 0;}")); EXPECT_TRUE(ERROR_SUCCESS == conf.parse(_MIN_OK_CONF"stats{network 0;}"));
} }
if (true) { if (true) {
MockSrsConfig conf; MockSrsConfig conf;
EXPECT_TRUE(ERROR_SUCCESS != conf.parse(_MIN_OK_CONF"stats{network_device_indexs 0;}")); EXPECT_TRUE(ERROR_SUCCESS != conf.parse(_MIN_OK_CONF"stats{networks 0;}"));
} }
if (true) { if (true) {
MockSrsConfig conf; MockSrsConfig conf;
EXPECT_TRUE(ERROR_SUCCESS != conf.parse(_MIN_OK_CONF"stats{network_device_index -100;}")); EXPECT_TRUE(ERROR_SUCCESS != conf.parse(_MIN_OK_CONF"stats{network -100;}"));
} }
if (true) { if (true) {
MockSrsConfig conf; MockSrsConfig conf;
EXPECT_TRUE(ERROR_SUCCESS != conf.parse(_MIN_OK_CONF"stats{network_device_index -1;}")); EXPECT_TRUE(ERROR_SUCCESS != conf.parse(_MIN_OK_CONF"stats{network -1;}"));
} }
if (true) { if (true) {