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

Refactor hybrid server model

Browse source
This commit is contained in:
winlin 2020-01-23 20:42:50 +08:00
parent 33c6bf1f8f
commit 2363d258de
2 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
trunk/src/app/srs_app_hybrid.cpp
View file

@ -49,6 +49,12 @@ SrsServerAdapter::~SrsServerAdapter()
} }
srs_error_t SrsServerAdapter::initialize() srs_error_t SrsServerAdapter::initialize()
{
srs_error_t err = srs_success;
return err;
}
srs_error_t SrsServerAdapter::run()
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
@ -61,21 +67,14 @@ srs_error_t SrsServerAdapter::initialize()
return srs_error_wrap(err, "initialize st"); return srs_error_wrap(err, "initialize st");
} }
return err; if ((err = srs->acquire_pid_file()) != srs_success) {
} return srs_error_wrap(err, "acquire pid file");
}
srs_error_t SrsServerAdapter::run()
{
srs_error_t err = srs_success;
if ((err = srs->initialize_signal()) != srs_success) { if ((err = srs->initialize_signal()) != srs_success) {
return srs_error_wrap(err, "initialize signal"); return srs_error_wrap(err, "initialize signal");
} }
if ((err = srs->acquire_pid_file()) != srs_success) {
return srs_error_wrap(err, "acquire pid file");
}
if ((err = srs->listen()) != srs_success) { if ((err = srs->listen()) != srs_success) {
return srs_error_wrap(err, "listen"); return srs_error_wrap(err, "listen");
} }

13
trunk/src/srt/srt_server.cpp
View file

@ -209,6 +209,12 @@ SrtServerAdapter::~SrtServerAdapter()
} }
srs_error_t SrtServerAdapter::initialize() srs_error_t SrtServerAdapter::initialize()
{
srs_error_t err = srs_success;
return err;
}
srs_error_t SrtServerAdapter::run()
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
@ -230,13 +236,6 @@ srs_error_t SrtServerAdapter::initialize()
srs_trace("srt server is disabled..."); srs_trace("srt server is disabled...");
} }
return err;
}
srs_error_t SrtServerAdapter::run()
{
srs_error_t err = srs_success;
if(_srs_config->get_srt_enabled()) { if(_srs_config->get_srt_enabled()) {
srt_ptr->start(); srt_ptr->start();
} }