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

add log tank config, default to console.

Browse source
This commit is contained in:
winlin 2014-03-23 14:40:55 +08:00
parent b290a00de7
commit 7930add7f9
9 changed files with 100 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -308,7 +308,7 @@ int SrsConfDirective::read_token(SrsFileBuffer* buffer, std::vector<string>& arg
srs_error("line %d: unexpected end of file, expecting ; or \"}\"", buffer->line);
return ERROR_SYSTEM_CONFIG_INVALID;
}
srs_trace("end of file. ret=%d", ret);
srs_trace("config parsed EOF");
return ret;
}
@ -684,7 +684,13 @@ int SrsConfig::parse_file(const char* filename)
// TODO: check http.
// TODO: check pid.
// check log
std::string log_filename = this->get_srs_log_file();
if (this->get_srs_log_tank_file() && log_filename.empty()) {
ret = ERROR_SYSTEM_CONFIG_INVALID;
srs_error("must specifies the file to write log to. ret=%d", ret);
return ret;
}
if (!log_filename.empty()) {
srs_trace("log file is %s", log_filename.c_str());
}
@ -1282,6 +1288,18 @@ string SrsConfig::get_srs_log_file()
return conf->arg0();
}
bool SrsConfig::get_srs_log_tank_file()
{
srs_assert(root);
SrsConfDirective* conf = root->get("srs_log_tank");
if (conf && conf->arg0() == "file") {
return true;
}
return false;
}
bool SrsConfig::get_deamon()
{
srs_assert(root);