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, config and log support complex error.

Browse source
This commit is contained in:
winlin 2017-06-11 14:03:19 +08:00
parent 860aac3e50
commit b5c14938d9
13 changed files with 267 additions and 353 deletions
Download patch file Download diff file Expand all files Collapse all files

13
trunk/src/utest/srs_utest_reload.cpp
View file

@ -283,16 +283,21 @@ MockSrsReloadConfig::~MockSrsReloadConfig()
{
}
int MockSrsReloadConfig::do_reload(string buf)
srs_error_t MockSrsReloadConfig::do_reload(string buf)
{
int ret = ERROR_SUCCESS;
srs_error_t err = srs_success;
MockSrsReloadConfig conf;
if ((ret = conf.parse(buf)) != ERROR_SUCCESS) {
return ret;
if ((err = conf.parse(buf)) != srs_success) {
return srs_error_wrap(err, "parse");
}
if ((ret = MockSrsConfig::reload_conf(&conf)) != ERROR_SUCCESS) {
return srs_error_new(ret, "reload conf");
}
return MockSrsConfig::reload_conf(&conf);
return err;
}
#ifdef ENABLE_UTEST_RELOAD