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

Main: Refine sever manager.

Browse source
This commit is contained in:
winlin 2021-02-09 12:44:56 +08:00
parent f9bd84109b
commit 77cffd3e04
5 changed files with 35 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -91,8 +91,8 @@ srs_error_t SrsServerAdapter::run()
return srs_error_wrap(err, "ingest");
}
if ((err = srs->cycle()) != srs_success) {
return srs_error_wrap(err, "main cycle");
if ((err = srs->start()) != srs_success) {
return srs_error_wrap(err, "start");
}
return err;
@ -151,29 +151,17 @@ srs_error_t SrsHybridServer::run()
{
srs_error_t err = srs_success;
// TODO: FIXME: Identify master server directly.
// Run master server in this main thread.
SrsServerAdapter* master_server = NULL;
vector<ISrsHybridServer*>::iterator it;
for (it = servers.begin(); it != servers.end(); ++it) {
ISrsHybridServer* server = *it;
if (!master_server) {
master_server = dynamic_cast<SrsServerAdapter*>(server);
if (master_server) {
continue;
}
}
if ((err = server->run()) != srs_success) {
return srs_error_wrap(err, "run server");
}
}
if (master_server) {
return master_server->run();
}
// Wait for all server to quit.
srs_thread_exit(NULL);
return err;
}