From 2363d258de196ffb560140ceb29a15474b137e45 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Thu, 23 Jan 2020 20:42:50 +0800
Subject: [PATCH] Refactor hybrid server model

---
 trunk/src/app/srs_app_hybrid.cpp | 19 +++++++++----------
 trunk/src/srt/srt_server.cpp     | 13 ++++++-------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/trunk/src/app/srs_app_hybrid.cpp b/trunk/src/app/srs_app_hybrid.cpp
index 1d33b4983..313c5e0c8 100644
--- a/trunk/src/app/srs_app_hybrid.cpp
+++ b/trunk/src/app/srs_app_hybrid.cpp
@@ -49,6 +49,12 @@ SrsServerAdapter::~SrsServerAdapter()
 }
 
 srs_error_t SrsServerAdapter::initialize()
+{
+    srs_error_t err = srs_success;
+    return err;
+}
+
+srs_error_t SrsServerAdapter::run()
 {
     srs_error_t err = srs_success;
 
@@ -61,21 +67,14 @@ srs_error_t SrsServerAdapter::initialize()
         return srs_error_wrap(err, "initialize st");
     }
 
-    return err;
-}
-
-srs_error_t SrsServerAdapter::run()
-{
-    srs_error_t err = srs_success;
+    if ((err = srs->acquire_pid_file()) != srs_success) {
+        return srs_error_wrap(err, "acquire pid file");
+    }
 
     if ((err = srs->initialize_signal()) != srs_success) {
         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) {
         return srs_error_wrap(err, "listen");
     }
diff --git a/trunk/src/srt/srt_server.cpp b/trunk/src/srt/srt_server.cpp
index 011545ad0..e518385a8 100644
--- a/trunk/src/srt/srt_server.cpp
+++ b/trunk/src/srt/srt_server.cpp
@@ -209,6 +209,12 @@ SrtServerAdapter::~SrtServerAdapter()
 }
 
 srs_error_t SrtServerAdapter::initialize()
+{
+    srs_error_t err = srs_success;
+    return err;
+}
+
+srs_error_t SrtServerAdapter::run()
 {
     srs_error_t err = srs_success;
 
@@ -230,13 +236,6 @@ srs_error_t SrtServerAdapter::initialize()
         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()) {
         srt_ptr->start();
     }