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

23
trunk/src/utest/srs_utest_config.cpp
View file

@ -50,9 +50,9 @@ MockSrsConfigBuffer::~MockSrsConfigBuffer()
{
}
int MockSrsConfigBuffer::fullfill(const char* /*filename*/)
srs_error_t MockSrsConfigBuffer::fullfill(const char* /*filename*/)
{
return ERROR_SUCCESS;
return srs_success;
}
MockSrsConfig::MockSrsConfig()
@ -63,22 +63,25 @@ MockSrsConfig::~MockSrsConfig()
{
}
int MockSrsConfig::parse(string buf)
srs_error_t MockSrsConfig::parse(string buf)
{
int ret = ERROR_SUCCESS;
srs_error_t err = srs_success;
MockSrsConfigBuffer buffer(buf);
if ((ret = parse_buffer(&buffer)) != ERROR_SUCCESS) {
return ret;
if ((err = parse_buffer(&buffer)) != srs_success) {
return srs_error_wrap(err, "parse buffer");
}
if ((ret = srs_config_transform_vhost(root)) != ERROR_SUCCESS) {
srs_error("transform config failed. ret=%d", ret);
return ret;
if ((err = srs_config_transform_vhost(root)) != srs_success) {
return srs_error_wrap(err, "transform config");
}
return check_normal_config();
if ((err = check_normal_config()) != srs_success) {
return srs_error_wrap(err, "check normal config");
}
return err;
}
#ifdef ENABLE_UTEST_CONFIG