From 42a2dea5e051a4881697593bbad6a3c523d7fe97 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 30 Sep 2020 11:14:49 +0800
Subject: [PATCH] Refine code

---
 trunk/src/app/srs_app_hybrid.cpp    |  1 +
 trunk/src/app/srs_app_rtc_queue.cpp |  2 +-
 trunk/src/app/srs_app_server.cpp    |  2 +-
 trunk/src/app/srs_app_server.hpp    |  3 ++-
 trunk/src/main/srs_main_server.cpp  | 14 +++++++-------
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/trunk/src/app/srs_app_hybrid.cpp b/trunk/src/app/srs_app_hybrid.cpp
index 9094de4f2..a43e08800 100644
--- a/trunk/src/app/srs_app_hybrid.cpp
+++ b/trunk/src/app/srs_app_hybrid.cpp
@@ -151,6 +151,7 @@ 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;
 
diff --git a/trunk/src/app/srs_app_rtc_queue.cpp b/trunk/src/app/srs_app_rtc_queue.cpp
index 75cea0505..827f835a2 100644
--- a/trunk/src/app/srs_app_rtc_queue.cpp
+++ b/trunk/src/app/srs_app_rtc_queue.cpp
@@ -195,7 +195,7 @@ SrsRtpNackForReceiver::SrsRtpNackForReceiver(SrsRtpRingBuffer* rtp, size_t queue
     rtt_ = 0;
 
     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()
diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp
index 279758c22..767b78cf9 100644
--- a/trunk/src/app/srs_app_server.cpp
+++ b/trunk/src/app/srs_app_server.cpp
@@ -1070,7 +1070,7 @@ srs_error_t SrsServer::cycle()
 
     // fast quit, do some essential cleanup.
     if (signal_fast_quit) {
-        dispose();
+        dispose(); // TODO: FIXME: Rename to essential_dispose.
         srs_trace("srs disposed");
     }
 
diff --git a/trunk/src/app/srs_app_server.hpp b/trunk/src/app/srs_app_server.hpp
index 4fd4fdbae..0f8a3892a 100644
--- a/trunk/src/app/srs_app_server.hpp
+++ b/trunk/src/app/srs_app_server.hpp
@@ -240,11 +240,12 @@ public:
     virtual void on_logrotate() = 0;
 };
 
+// TODO: FIXME: Rename to SrsLiveServer.
 // SRS RTMP server, initialize and listen, start connection service thread, destroy client.
 class SrsServer : virtual public ISrsReloadHandler, virtual public ISrsSourceHandler, virtual public ISrsResourceManager
 {
 private:
-    // TODO: FIXME: rename to http_api
+    // TODO: FIXME: Extract an HttpApiServer.
     SrsHttpServeMux* http_api_mux;
     SrsHttpServer* http_server;
     SrsHttpHeartbeat* http_heartbeat;
diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp
index 60b100383..37e8b9f42 100644
--- a/trunk/src/main/srs_main_server.cpp
+++ b/trunk/src/main/srs_main_server.cpp
@@ -409,16 +409,16 @@ srs_error_t run_directly_or_daemon()
 
     // Load daemon from config, disable it for docker.
     // @see https://github.com/ossrs/srs/issues/1594
-    bool in_daemon = _srs_config->get_daemon();
-    if (in_daemon && _srs_in_docker && _srs_config->disable_daemon_for_docker()) {
+    bool run_as_daemon = _srs_config->get_daemon();
+    if (run_as_daemon && _srs_in_docker && _srs_config->disable_daemon_for_docker()) {
         srs_warn("disable daemon for docker");
-        in_daemon = false;
+        run_as_daemon = false;
     }
     
-    // If not daemon, directly run master.
-    if (!in_daemon) {
+    // If not daemon, directly run hybrid server.
+    if (!run_as_daemon) {
         if ((err = run_hybrid_server()) != srs_success) {
-            return srs_error_wrap(err, "run master");
+            return srs_error_wrap(err, "run hybrid");
         }
         return srs_success;
     }
@@ -455,7 +455,7 @@ srs_error_t run_directly_or_daemon()
     srs_trace("son(daemon) process running.");
     
     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;