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

For #913, reload use complex error

Browse source
This commit is contained in:
winlin 2017-09-22 16:14:30 +08:00
parent 3744606c9b
commit fd91df9411
28 changed files with 642 additions and 630 deletions
Download patch file Download diff file Expand all files Collapse all files

30
trunk/src/app/srs_app_log.cpp
View file

@ -206,23 +206,23 @@ srs_error_t SrsFastLog::on_reload_utc_time()
return srs_success;
}
int SrsFastLog::on_reload_log_tank()
srs_error_t SrsFastLog::on_reload_log_tank()
{
int ret = ERROR_SUCCESS;
srs_error_t err = srs_success;
if (!_srs_config) {
return ret;
return err;
}
bool tank = log_to_file_tank;
log_to_file_tank = _srs_config->get_log_tank_file();
if (tank) {
return ret;
return err;
}
if (!log_to_file_tank) {
return ret;
return err;
}
if (fd > 0) {
@ -230,32 +230,32 @@ int SrsFastLog::on_reload_log_tank()
}
open_log_file();
return ret;
return err;
}
int SrsFastLog::on_reload_log_level()
srs_error_t SrsFastLog::on_reload_log_level()
{
int ret = ERROR_SUCCESS;
srs_error_t err = srs_success;
if (!_srs_config) {
return ret;
return err;
}
level = srs_get_log_level(_srs_config->get_log_level());
return ret;
return err;
}
int SrsFastLog::on_reload_log_file()
srs_error_t SrsFastLog::on_reload_log_file()
{
int ret = ERROR_SUCCESS;
srs_error_t err = srs_success;
if (!_srs_config) {
return ret;
return err;
}
if (!log_to_file_tank) {
return ret;
return err;
}
if (fd > 0) {
@ -263,7 +263,7 @@ int SrsFastLog::on_reload_log_file()
}
open_log_file();
return ret;
return err;
}
void SrsFastLog::write_log(int& fd, char *str_log, int size, int level)