diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index caaf4dc58..1a99984ba 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -1086,6 +1086,11 @@ int SrsConfig::parse_options(int argc, char** argv) return ret; } +string SrsConfig::config() +{ + return config_file; +} + int SrsConfig::parse_argv(int& i, char** argv) { int ret = ERROR_SUCCESS; @@ -1564,9 +1569,6 @@ int SrsConfig::check_config() } } - // show important args. - srs_trace("conf: %s, limit: %d", config_file.c_str(), get_max_connections()); - //////////////////////////////////////////////////////////////////////// // check features //////////////////////////////////////////////////////////////////////// diff --git a/trunk/src/app/srs_app_config.hpp b/trunk/src/app/srs_app_config.hpp index fe92bb5a8..0b1bb2dc7 100644 --- a/trunk/src/app/srs_app_config.hpp +++ b/trunk/src/app/srs_app_config.hpp @@ -323,6 +323,10 @@ public: * parse the cli, the main(argc,argv) function. */ virtual int parse_options(int argc, char** argv); + /** + * get the config file path. + */ + virtual std::string config(); private: /** * parse each argv. diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 8a7f6ba21..cfcea2b12 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // current release version #define VERSION_MAJOR "0" #define VERSION_MINOR "9" -#define VERSION_REVISION "209" +#define VERSION_REVISION "210" #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION // server info. #define RTMP_SIG_SRS_KEY "SRS" diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index fdd0b0dbe..15c525b74 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -100,6 +100,7 @@ int main(int argc, char** argv) #ifdef SRS_AUTO_ARM_UBUNTU12 srs_trace("arm tool chain: "SRS_AUTO_EMBEDED_TOOL_CHAIN); #endif + srs_trace("conf: %s, limit: %d", _srs_config->config().c_str(), _srs_config->get_max_connections()); /** * we do nothing in the constructor of server,