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

Refine code

Browse source
This commit is contained in:
winlin 2020-09-30 11:14:49 +08:00
parent 4ccb83834d
commit 42a2dea5e0
5 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -151,6 +151,7 @@ srs_error_t SrsHybridServer::run()
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
// TODO: FIXME: Identify master server directly.
// Run master server in this main thread. // Run master server in this main thread.
SrsServerAdapter* master_server = NULL; SrsServerAdapter* master_server = NULL;

2
trunk/src/app/srs_app_rtc_queue.cpp
View file

@ -195,7 +195,7 @@ SrsRtpNackForReceiver::SrsRtpNackForReceiver(SrsRtpRingBuffer* rtp, size_t queue
rtt_ = 0; rtt_ = 0;
srs_info("max_queue_size=%u, nack opt: max_count=%d, max_alive_time=%us, first_nack_interval=%" PRId64 ", nack_interval=%" PRId64, srs_info("max_queue_size=%u, nack opt: max_count=%d, max_alive_time=%us, first_nack_interval=%" PRId64 ", nack_interval=%" PRId64,
max_queue_size_, opts_.max_count, opts_.max_alive_time, opts.first_nack_interval, opts_.nack_interval); max_queue_size_, opts_.max_count, opts_.max_alive_time, opts_.first_nack_interval, opts_.nack_interval);
} }
SrsRtpNackForReceiver::~SrsRtpNackForReceiver() SrsRtpNackForReceiver::~SrsRtpNackForReceiver()

2
trunk/src/app/srs_app_server.cpp
View file

@ -1070,7 +1070,7 @@ srs_error_t SrsServer::cycle()
// fast quit, do some essential cleanup. // fast quit, do some essential cleanup.
if (signal_fast_quit) { if (signal_fast_quit) {
dispose(); dispose(); // TODO: FIXME: Rename to essential_dispose.
srs_trace("srs disposed"); srs_trace("srs disposed");
} }

3
trunk/src/app/srs_app_server.hpp
View file

@ -240,11 +240,12 @@ public:
virtual void on_logrotate() = 0; virtual void on_logrotate() = 0;
}; };
// TODO: FIXME: Rename to SrsLiveServer.
// SRS RTMP server, initialize and listen, start connection service thread, destroy client. // SRS RTMP server, initialize and listen, start connection service thread, destroy client.
class SrsServer : virtual public ISrsReloadHandler, virtual public ISrsSourceHandler, virtual public ISrsResourceManager class SrsServer : virtual public ISrsReloadHandler, virtual public ISrsSourceHandler, virtual public ISrsResourceManager
{ {
private: private:
// TODO: FIXME: rename to http_api // TODO: FIXME: Extract an HttpApiServer.
SrsHttpServeMux* http_api_mux; SrsHttpServeMux* http_api_mux;
SrsHttpServer* http_server; SrsHttpServer* http_server;
SrsHttpHeartbeat* http_heartbeat; SrsHttpHeartbeat* http_heartbeat;

14
trunk/src/main/srs_main_server.cpp
View file

@ -409,16 +409,16 @@ srs_error_t run_directly_or_daemon()
// Load daemon from config, disable it for docker. // Load daemon from config, disable it for docker.
// @see https://github.com/ossrs/srs/issues/1594 // @see https://github.com/ossrs/srs/issues/1594
bool in_daemon = _srs_config->get_daemon(); bool run_as_daemon = _srs_config->get_daemon();
if (in_daemon && _srs_in_docker && _srs_config->disable_daemon_for_docker()) { if (run_as_daemon && _srs_in_docker && _srs_config->disable_daemon_for_docker()) {
srs_warn("disable daemon for docker"); srs_warn("disable daemon for docker");
in_daemon = false; run_as_daemon = false;
} }
// If not daemon, directly run master. // If not daemon, directly run hybrid server.
if (!in_daemon) { if (!run_as_daemon) {
if ((err = run_hybrid_server()) != srs_success) { if ((err = run_hybrid_server()) != srs_success) {
return srs_error_wrap(err, "run master"); return srs_error_wrap(err, "run hybrid");
} }
return srs_success; return srs_success;
} }
@ -455,7 +455,7 @@ srs_error_t run_directly_or_daemon()
srs_trace("son(daemon) process running."); srs_trace("son(daemon) process running.");
if ((err = run_hybrid_server()) != srs_success) { if ((err = run_hybrid_server()) != srs_success) {
return srs_error_wrap(err, "daemon run master"); return srs_error_wrap(err, "daemon run hybrid");
} }
return err; return err;