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

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

@ -137,142 +137,142 @@ bool MockReloadHandler::all_true()
return count_true() == count_total();
}
int MockReloadHandler::on_reload_listen()
srs_error_t MockReloadHandler::on_reload_listen()
{
listen_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_pid()
srs_error_t MockReloadHandler::on_reload_pid()
{
pid_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_log_tank()
srs_error_t MockReloadHandler::on_reload_log_tank()
{
log_tank_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_log_level()
srs_error_t MockReloadHandler::on_reload_log_level()
{
log_level_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_log_file()
srs_error_t MockReloadHandler::on_reload_log_file()
{
log_file_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_pithy_print()
srs_error_t MockReloadHandler::on_reload_pithy_print()
{
pithy_print_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_http_api_enabled()
srs_error_t MockReloadHandler::on_reload_http_api_enabled()
{
http_api_enabled_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_http_api_disabled()
srs_error_t MockReloadHandler::on_reload_http_api_disabled()
{
http_api_disabled_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_http_stream_enabled()
srs_error_t MockReloadHandler::on_reload_http_stream_enabled()
{
http_stream_enabled_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_http_stream_disabled()
srs_error_t MockReloadHandler::on_reload_http_stream_disabled()
{
http_stream_disabled_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_http_stream_updated()
srs_error_t MockReloadHandler::on_reload_http_stream_updated()
{
http_stream_updated_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_vhost_http_updated()
srs_error_t MockReloadHandler::on_reload_vhost_http_updated()
{
vhost_http_updated_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_vhost_added(string /*vhost*/)
srs_error_t MockReloadHandler::on_reload_vhost_added(string /*vhost*/)
{
vhost_added_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_vhost_removed(string /*vhost*/)
srs_error_t MockReloadHandler::on_reload_vhost_removed(string /*vhost*/)
{
vhost_removed_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_vhost_play(string /*vhost*/)
srs_error_t MockReloadHandler::on_reload_vhost_play(string /*vhost*/)
{
vhost_play_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_vhost_forward(string /*vhost*/)
srs_error_t MockReloadHandler::on_reload_vhost_forward(string /*vhost*/)
{
vhost_forward_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_vhost_hls(string /*vhost*/)
srs_error_t MockReloadHandler::on_reload_vhost_hls(string /*vhost*/)
{
vhost_hls_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_vhost_hds(string /*vhost*/)
srs_error_t MockReloadHandler::on_reload_vhost_hds(string /*vhost*/)
{
vhost_hls_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_vhost_dvr(string /*vhost*/)
srs_error_t MockReloadHandler::on_reload_vhost_dvr(string /*vhost*/)
{
vhost_dvr_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_vhost_transcode(string /*vhost*/)
srs_error_t MockReloadHandler::on_reload_vhost_transcode(string /*vhost*/)
{
vhost_transcode_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_ingest_removed(string /*vhost*/, string /*ingest_id*/)
srs_error_t MockReloadHandler::on_reload_ingest_removed(string /*vhost*/, string /*ingest_id*/)
{
ingest_removed_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_ingest_added(string /*vhost*/, string /*ingest_id*/)
srs_error_t MockReloadHandler::on_reload_ingest_added(string /*vhost*/, string /*ingest_id*/)
{
ingest_added_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
int MockReloadHandler::on_reload_ingest_updated(string /*vhost*/, string /*ingest_id*/)
srs_error_t MockReloadHandler::on_reload_ingest_updated(string /*vhost*/, string /*ingest_id*/)
{
ingest_updated_reloaded = true;
return ERROR_SUCCESS;
return srs_success;
}
MockSrsReloadConfig::MockSrsReloadConfig()

46
trunk/src/utest/srs_utest_reload.hpp
View file

@ -68,29 +68,29 @@ public:
virtual int count_true();
virtual int count_false();
public:
virtual int on_reload_listen();
virtual int on_reload_pid();
virtual int on_reload_log_tank();
virtual int on_reload_log_level();
virtual int on_reload_log_file();
virtual int on_reload_pithy_print();
virtual int on_reload_http_api_enabled();
virtual int on_reload_http_api_disabled();
virtual int on_reload_http_stream_enabled();
virtual int on_reload_http_stream_disabled();
virtual int on_reload_http_stream_updated();
virtual int on_reload_vhost_http_updated();
virtual int on_reload_vhost_added(std::string vhost);
virtual int on_reload_vhost_removed(std::string vhost);
virtual int on_reload_vhost_play(std::string vhost);
virtual int on_reload_vhost_forward(std::string vhost);
virtual int on_reload_vhost_hls(std::string vhost);
virtual int on_reload_vhost_hds(std::string vhost);
virtual int on_reload_vhost_dvr(std::string vhost);
virtual int on_reload_vhost_transcode(std::string vhost);
virtual int on_reload_ingest_removed(std::string vhost, std::string ingest_id);
virtual int on_reload_ingest_added(std::string vhost, std::string ingest_id);
virtual int on_reload_ingest_updated(std::string vhost, std::string ingest_id);
virtual srs_error_t on_reload_listen();
virtual srs_error_t on_reload_pid();
virtual srs_error_t on_reload_log_tank();
virtual srs_error_t on_reload_log_level();
virtual srs_error_t on_reload_log_file();
virtual srs_error_t on_reload_pithy_print();
virtual srs_error_t on_reload_http_api_enabled();
virtual srs_error_t on_reload_http_api_disabled();
virtual srs_error_t on_reload_http_stream_enabled();
virtual srs_error_t on_reload_http_stream_disabled();
virtual srs_error_t on_reload_http_stream_updated();
virtual srs_error_t on_reload_vhost_http_updated();
virtual srs_error_t on_reload_vhost_added(std::string vhost);
virtual srs_error_t on_reload_vhost_removed(std::string vhost);
virtual srs_error_t on_reload_vhost_play(std::string vhost);
virtual srs_error_t on_reload_vhost_forward(std::string vhost);
virtual srs_error_t on_reload_vhost_hls(std::string vhost);
virtual srs_error_t on_reload_vhost_hds(std::string vhost);
virtual srs_error_t on_reload_vhost_dvr(std::string vhost);
virtual srs_error_t on_reload_vhost_transcode(std::string vhost);
virtual srs_error_t on_reload_ingest_removed(std::string vhost, std::string ingest_id);
virtual srs_error_t on_reload_ingest_added(std::string vhost, std::string ingest_id);
virtual srs_error_t on_reload_ingest_updated(std::string vhost, std::string ingest_id);
};
class MockSrsReloadConfig : public MockSrsConfig