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

reorder the config functions. add comments for st to support 100k threads, use MALLOC_STACK macro.

Browse source
This commit is contained in:
winlin 2014-08-27 12:28:05 +08:00
parent 42a43c69cd
commit 839101a036
3 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2746,6 +2746,30 @@ string SrsConfig::get_ingest_input_url(SrsConfDirective* ingest)
return conf->arg0();
}
bool SrsConfig::get_log_tank_file()
{
srs_assert(root);
SrsConfDirective* conf = root->get("srs_log_tank");
if (conf && conf->arg0() == SRS_CONF_DEFAULT_LOG_TANK_CONSOLE) {
return false;
}
return true;
}
string SrsConfig::get_log_level()
{
srs_assert(root);
SrsConfDirective* conf = root->get("srs_log_level");
if (!conf || conf->arg0().empty()) {
return SRS_CONF_DEFAULT_LOG_LEVEL;
}
return conf->arg0();
}
string SrsConfig::get_log_file()
{
srs_assert(root);
@ -2776,30 +2800,6 @@ string SrsConfig::get_ffmpeg_log_dir()
return conf->arg0();
}
string SrsConfig::get_log_level()
{
srs_assert(root);
SrsConfDirective* conf = root->get("srs_log_level");
if (!conf || conf->arg0().empty()) {
return SRS_CONF_DEFAULT_LOG_LEVEL;
}
return conf->arg0();
}
bool SrsConfig::get_log_tank_file()
{
srs_assert(root);
SrsConfDirective* conf = root->get("srs_log_tank");
if (conf && conf->arg0() == SRS_CONF_DEFAULT_LOG_TANK_CONSOLE) {
return false;
}
return true;
}
SrsConfDirective* SrsConfig::get_hls(string vhost)
{
SrsConfDirective* conf = get_vhost(vhost);