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

refine log, log important to file. 1.0.210

Browse source
This commit is contained in:
winlin 2014-08-29 15:07:04 +08:00
parent 728b749384
commit 901c9590e4
4 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1086,6 +1086,11 @@ int SrsConfig::parse_options(int argc, char** argv)
return ret; return ret;
} }
string SrsConfig::config()
{
return config_file;
}
int SrsConfig::parse_argv(int& i, char** argv) int SrsConfig::parse_argv(int& i, char** argv)
{ {
int ret = ERROR_SUCCESS; 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 // check features
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////

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

@ -323,6 +323,10 @@ public:
* parse the cli, the main(argc,argv) function. * parse the cli, the main(argc,argv) function.
*/ */
virtual int parse_options(int argc, char** argv); virtual int parse_options(int argc, char** argv);
/**
* get the config file path.
*/
virtual std::string config();
private: private:
/** /**
* parse each argv. * parse each argv.

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR "0" #define VERSION_MAJOR "0"
#define VERSION_MINOR "9" #define VERSION_MINOR "9"
#define VERSION_REVISION "209" #define VERSION_REVISION "210"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info. // server info.
#define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_KEY "SRS"

1
trunk/src/main/srs_main_server.cpp
View file

@ -100,6 +100,7 @@ int main(int argc, char** argv)
#ifdef SRS_AUTO_ARM_UBUNTU12 #ifdef SRS_AUTO_ARM_UBUNTU12
srs_trace("arm tool chain: "SRS_AUTO_EMBEDED_TOOL_CHAIN); srs_trace("arm tool chain: "SRS_AUTO_EMBEDED_TOOL_CHAIN);
#endif #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, * we do nothing in the constructor of server,