diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index f10bdd088..ec9e53cc4 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -520,10 +520,6 @@ rtc_server { # @see https://github.com/ossrs/srs/issues/307#issuecomment-612806318 # default: off merge_nalus off; - # Whether enable the perf stat at http://localhost:1985/api/v1/perf - # TODO: FIXME: We should enable it when refined. - # default: off - perf_stat off; # The black-hole to copy packet to, for debugging. # For example, when debugging Chrome publish stream, the received packets are encrypted cipher, # we can set the publisher black-hole, SRS will copy the plaintext packets to black-hole, and diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index daa024a57..acb3e1689 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -3678,7 +3678,7 @@ srs_error_t SrsConfig::check_normal_config() for (int i = 0; conf && i < (int)conf->directives.size(); i++) { string n = conf->at(i)->name; if (n != "enabled" && n != "listen" && n != "dir" && n != "candidate" && n != "ecdsa" - && n != "encrypt" && n != "reuseport" && n != "merge_nalus" && n != "perf_stat" && n != "black_hole" + && n != "encrypt" && n != "reuseport" && n != "merge_nalus" && n != "black_hole" && n != "ip_family") { return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "illegal rtc_server.%s", n.c_str()); } @@ -5033,23 +5033,6 @@ bool SrsConfig::get_rtc_server_merge_nalus() return SRS_CONF_PERFER_TRUE(conf->arg0()); } -bool SrsConfig::get_rtc_server_perf_stat() -{ - static bool DEFAULT = false; - - SrsConfDirective* conf = root->get("rtc_server"); - if (!conf) { - return DEFAULT; - } - - conf = conf->get("perf_stat"); - if (!conf || conf->arg0().empty()) { - return DEFAULT; - } - - return SRS_CONF_PERFER_FALSE(conf->arg0()); -} - bool SrsConfig::get_rtc_server_black_hole() { static bool DEFAULT = false; diff --git a/trunk/src/app/srs_app_config.hpp b/trunk/src/app/srs_app_config.hpp index 6493eadae..431d09c8a 100644 --- a/trunk/src/app/srs_app_config.hpp +++ b/trunk/src/app/srs_app_config.hpp @@ -542,7 +542,6 @@ public: virtual bool get_rtc_server_encrypt(); virtual int get_rtc_server_reuseport(); virtual bool get_rtc_server_merge_nalus(); - virtual bool get_rtc_server_perf_stat(); public: virtual bool get_rtc_server_black_hole(); virtual std::string get_rtc_server_black_hole_addr();