refine the signal manager.

@@ -374,8 +374,6 @@ SrsSignalManager::SrsSignalManager(SrsServer* server)
 
 
 SrsSignalManager::~SrsSignalManager()
 SrsSignalManager::~SrsSignalManager()
 {
 {
-    srs_freep(pthread);
-    
     srs_close_stfd(signal_read_stfd);
     srs_close_stfd(signal_read_stfd);
     
     
     if (sig_pipe[0] > 0) {
     if (sig_pipe[0] > 0) {
@@ -384,18 +382,32 @@ SrsSignalManager::~SrsSignalManager()
     if (sig_pipe[1] > 0) {
     if (sig_pipe[1] > 0) {
         ::close(sig_pipe[1]);
         ::close(sig_pipe[1]);
     }
     }
+    
+    srs_freep(pthread);
 }
 }
 
 
 int SrsSignalManager::initialize()
 int SrsSignalManager::initialize()
 {
 {
     int ret = ERROR_SUCCESS;
     int ret = ERROR_SUCCESS;
+    
+    /* Create signal pipe */
+    if (pipe(sig_pipe) < 0) {
+        ret = ERROR_SYSTEM_CREATE_PIPE;
+        srs_error("create signal manager pipe failed. ret=%d", ret);
+        return ret;
+    }
+    
+    if ((signal_read_stfd = st_netfd_open(sig_pipe[0])) == NULL) {
+        ret = ERROR_SYSTEM_CREATE_PIPE;
+        srs_error("create signal manage st pipe failed. ret=%d", ret);
+        return ret;
+    }
+    
     return ret;
     return ret;
 }
 }
 
 
 int SrsSignalManager::start()
 int SrsSignalManager::start()
 {
 {
-    int ret = ERROR_SUCCESS;
-    
     /**
     /**
     * Note that if multiple processes are used (see below), 
     * Note that if multiple processes are used (see below), 
     * the signal pipe should be initialized after the fork(2) call 
     * the signal pipe should be initialized after the fork(2) call 
@@ -403,13 +415,6 @@ int SrsSignalManager::start()
     */
     */
     struct sigaction sa;
     struct sigaction sa;
     
     
-    /* Create signal pipe */
-    if (pipe(sig_pipe) < 0) {
-        ret = ERROR_SYSTEM_CREATE_PIPE;
-        srs_error("create signal manager pipe failed. ret=%d", ret);
-        return ret;
-    }
-    
     /* Install sig_catcher() as a signal handler */
     /* Install sig_catcher() as a signal handler */
     sa.sa_handler = SrsSignalManager::sig_catcher;
     sa.sa_handler = SrsSignalManager::sig_catcher;
     sigemptyset(&sa.sa_mask);
     sigemptyset(&sa.sa_mask);
@@ -440,10 +445,6 @@ int SrsSignalManager::cycle()
 {
 {
     int ret = ERROR_SUCCESS;
     int ret = ERROR_SUCCESS;
 
 
-    if (signal_read_stfd == NULL) {
-        signal_read_stfd = st_netfd_open(sig_pipe[0]);
-    }
-
     int signo;
     int signo;
     
     
     /* Read the next signal from the pipe */
     /* Read the next signal from the pipe */
@@ -852,6 +853,7 @@ int SrsServer::cycle()
 #else
 #else
     srs_warn("main cycle terminated, system quit normally.");
     srs_warn("main cycle terminated, system quit normally.");
     dispose();
     dispose();
+    srs_trace("srs terminated");
     exit(0);
     exit(0);
 #endif
 #endif