From adb6f723c717871ec8fdee4d2373468721903539 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Thu, 18 Feb 2021 11:39:25 +0800
Subject: [PATCH] Config: Update config files, daemon off, log to console

---
 trunk/conf/demo.19350.conf          | 5 ++---
 trunk/conf/demo.conf                | 5 ++---
 trunk/conf/dvr.mp4.conf             | 2 ++
 trunk/conf/edge.conf                | 2 ++
 trunk/conf/edge2.conf               | 2 ++
 trunk/conf/exec.conf                | 2 ++
 trunk/conf/ffmpeg.transcode.conf    | 2 ++
 trunk/conf/forward.master.conf      | 2 ++
 trunk/conf/forward.slave.conf       | 2 ++
 trunk/conf/hls.conf                 | 2 ++
 trunk/conf/hls.realtime.conf        | 2 ++
 trunk/conf/http.api.raw.conf        | 4 ++--
 trunk/conf/http.flv.live.conf       | 2 ++
 trunk/conf/http.flv.live.edge1.conf | 2 ++
 trunk/conf/http.flv.live.edge2.conf | 2 ++
 trunk/conf/ingest.conf              | 2 ++
 trunk/conf/ingest.rtsp.conf         | 2 ++
 trunk/conf/origin.conf              | 2 ++
 trunk/conf/push.gb28181.conf        | 2 ++
 trunk/conf/realtime.conf            | 2 ++
 trunk/conf/rtc.conf                 | 3 ++-
 trunk/conf/rtmp.conf                | 2 ++
 trunk/conf/srs.conf                 | 4 ----
 trunk/conf/srt.conf                 | 2 ++
 24 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/trunk/conf/demo.19350.conf b/trunk/conf/demo.19350.conf
index c27e57500..b2c6bea46 100644
--- a/trunk/conf/demo.19350.conf
+++ b/trunk/conf/demo.19350.conf
@@ -4,9 +4,8 @@
 
 listen              19350;
 max_connections     1000;
-daemon              on;
-srs_log_tank        file;
-srs_log_file        ./objs/srs.demo.19350.log;
+daemon              off;
+srs_log_tank        console;
 pid                 ./objs/srs.demo.19350.pid;
 
 vhost __defaultVhost__ {
diff --git a/trunk/conf/demo.conf b/trunk/conf/demo.conf
index 4b1ef9879..1bdd46b86 100644
--- a/trunk/conf/demo.conf
+++ b/trunk/conf/demo.conf
@@ -4,9 +4,8 @@
 
 listen              1935;
 max_connections     1000;
-daemon              on;
-srs_log_tank        file;
-srs_log_file        ./objs/srs.demo.log;
+daemon              off;
+srs_log_tank        console;
 pid                 ./objs/srs.demo.pid;
 
 chunk_size          60000;
diff --git a/trunk/conf/dvr.mp4.conf b/trunk/conf/dvr.mp4.conf
index dccb8c3d6..a4f888c3a 100644
--- a/trunk/conf/dvr.mp4.conf
+++ b/trunk/conf/dvr.mp4.conf
@@ -4,6 +4,8 @@
 
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     dvr {
         enabled      on;
diff --git a/trunk/conf/edge.conf b/trunk/conf/edge.conf
index d4233b31f..36acb431f 100644
--- a/trunk/conf/edge.conf
+++ b/trunk/conf/edge.conf
@@ -5,6 +5,8 @@
 listen              1935;
 max_connections     1000;
 pid                 objs/edge.pid;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     cluster {
         mode            remote;
diff --git a/trunk/conf/edge2.conf b/trunk/conf/edge2.conf
index 52d469a44..193238d88 100644
--- a/trunk/conf/edge2.conf
+++ b/trunk/conf/edge2.conf
@@ -5,6 +5,8 @@
 listen              1935;
 max_connections     1000;
 pid                 objs/edge2.pid;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     cluster {
         mode            remote;
diff --git a/trunk/conf/exec.conf b/trunk/conf/exec.conf
index 6390217d6..2f4481092 100644
--- a/trunk/conf/exec.conf
+++ b/trunk/conf/exec.conf
@@ -4,6 +4,8 @@
 
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     exec {
         enabled     on;
diff --git a/trunk/conf/ffmpeg.transcode.conf b/trunk/conf/ffmpeg.transcode.conf
index 1bb505556..d785a44ff 100644
--- a/trunk/conf/ffmpeg.transcode.conf
+++ b/trunk/conf/ffmpeg.transcode.conf
@@ -4,6 +4,8 @@
 
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     transcode {
         enabled     on;
diff --git a/trunk/conf/forward.master.conf b/trunk/conf/forward.master.conf
index 2366f3195..630a4c84e 100644
--- a/trunk/conf/forward.master.conf
+++ b/trunk/conf/forward.master.conf
@@ -5,6 +5,8 @@
 listen              1935;
 max_connections     1000;
 pid                 ./objs/srs.master.pid;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     forward {
         enabled on;
diff --git a/trunk/conf/forward.slave.conf b/trunk/conf/forward.slave.conf
index f4cc1a37f..98286e33e 100644
--- a/trunk/conf/forward.slave.conf
+++ b/trunk/conf/forward.slave.conf
@@ -5,5 +5,7 @@
 listen              19350;
 max_connections     1000;
 pid                 ./objs/srs.slave.pid;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
 }
diff --git a/trunk/conf/hls.conf b/trunk/conf/hls.conf
index a0979eb19..735c1dd0d 100644
--- a/trunk/conf/hls.conf
+++ b/trunk/conf/hls.conf
@@ -4,6 +4,8 @@
 
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 http_server {
     enabled         on;
     listen          8080;
diff --git a/trunk/conf/hls.realtime.conf b/trunk/conf/hls.realtime.conf
index 36052418c..36453413f 100644
--- a/trunk/conf/hls.realtime.conf
+++ b/trunk/conf/hls.realtime.conf
@@ -4,6 +4,8 @@
 
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 http_server {
     enabled         on;
     listen          8080;
diff --git a/trunk/conf/http.api.raw.conf b/trunk/conf/http.api.raw.conf
index 00b2f80a6..df0180fbc 100644
--- a/trunk/conf/http.api.raw.conf
+++ b/trunk/conf/http.api.raw.conf
@@ -3,8 +3,8 @@
 
 listen              1935;
 max_connections     1000;
-srs_log_tank        file;
-srs_log_file        ./objs/srs.log;
+daemon              off;
+srs_log_tank        console;
 http_api {
     enabled         on;
     listen          1985;
diff --git a/trunk/conf/http.flv.live.conf b/trunk/conf/http.flv.live.conf
index 09ba1dffc..78c28546d 100644
--- a/trunk/conf/http.flv.live.conf
+++ b/trunk/conf/http.flv.live.conf
@@ -4,6 +4,8 @@
 
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 http_server {
     enabled         on;
     listen          8080;
diff --git a/trunk/conf/http.flv.live.edge1.conf b/trunk/conf/http.flv.live.edge1.conf
index ac2f6b344..23af7d1ca 100644
--- a/trunk/conf/http.flv.live.edge1.conf
+++ b/trunk/conf/http.flv.live.edge1.conf
@@ -5,6 +5,8 @@
 listen              19351;
 max_connections     1000;
 pid                 objs/srs.flv.19351.pid;
+daemon              off;
+srs_log_tank        console;
 http_server {
     enabled         on;
     listen          8081;
diff --git a/trunk/conf/http.flv.live.edge2.conf b/trunk/conf/http.flv.live.edge2.conf
index c1ab67551..fcf226066 100644
--- a/trunk/conf/http.flv.live.edge2.conf
+++ b/trunk/conf/http.flv.live.edge2.conf
@@ -5,6 +5,8 @@
 listen              19352;
 max_connections     1000;
 pid                 objs/srs.flv.19352.pid;
+daemon              off;
+srs_log_tank        console;
 http_server {
     enabled         on;
     listen          8082;
diff --git a/trunk/conf/ingest.conf b/trunk/conf/ingest.conf
index 7b3d1c2ed..d77a2f954 100644
--- a/trunk/conf/ingest.conf
+++ b/trunk/conf/ingest.conf
@@ -4,6 +4,8 @@
 
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     ingest livestream {
         enabled      on;
diff --git a/trunk/conf/ingest.rtsp.conf b/trunk/conf/ingest.rtsp.conf
index c89d7b5e1..bffb2a726 100644
--- a/trunk/conf/ingest.rtsp.conf
+++ b/trunk/conf/ingest.rtsp.conf
@@ -4,6 +4,8 @@
 
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     ingest {
         enabled      on;
diff --git a/trunk/conf/origin.conf b/trunk/conf/origin.conf
index 5f9eaeefc..9b7b779a1 100644
--- a/trunk/conf/origin.conf
+++ b/trunk/conf/origin.conf
@@ -5,5 +5,7 @@
 listen              19350;
 max_connections     1000;
 pid                 ./objs/origin.pid;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
 }
diff --git a/trunk/conf/push.gb28181.conf b/trunk/conf/push.gb28181.conf
index 64578d801..7f2076243 100644
--- a/trunk/conf/push.gb28181.conf
+++ b/trunk/conf/push.gb28181.conf
@@ -2,6 +2,8 @@
 
 listen                  1935;
 max_connections         1000;
+daemon              off;
+srs_log_tank        console;
 
 http_api {
     enabled         on;
diff --git a/trunk/conf/realtime.conf b/trunk/conf/realtime.conf
index 26b9b989f..482add3ea 100644
--- a/trunk/conf/realtime.conf
+++ b/trunk/conf/realtime.conf
@@ -4,6 +4,8 @@
 
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
     tcp_nodelay     on
     min_latency     on;
diff --git a/trunk/conf/rtc.conf b/trunk/conf/rtc.conf
index 13148cee0..02b97079b 100644
--- a/trunk/conf/rtc.conf
+++ b/trunk/conf/rtc.conf
@@ -1,7 +1,8 @@
 
 listen              1935;
 max_connections     1000;
-srs_log_file        ./objs/srs.log;
+daemon              off;
+srs_log_tank        console;
 
 http_server {
     enabled         on;
diff --git a/trunk/conf/rtmp.conf b/trunk/conf/rtmp.conf
index 94c740c50..e05f15408 100644
--- a/trunk/conf/rtmp.conf
+++ b/trunk/conf/rtmp.conf
@@ -4,5 +4,7 @@
 
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 vhost __defaultVhost__ {
 }
diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf
index 736547445..eb7725331 100644
--- a/trunk/conf/srs.conf
+++ b/trunk/conf/srs.conf
@@ -15,10 +15,6 @@ http_server {
     listen          8080;
     dir             ./objs/nginx/html;
 }
-stats {
-    network         0;
-    disk            sda sdb xvda xvdb;
-}
 vhost __defaultVhost__ {
     hls {
         enabled         on;
diff --git a/trunk/conf/srt.conf b/trunk/conf/srt.conf
index d85752289..f60ce5ded 100644
--- a/trunk/conf/srt.conf
+++ b/trunk/conf/srt.conf
@@ -2,6 +2,8 @@
 
 listen              1935;
 max_connections     1000;
+daemon              off;
+srs_log_tank        console;
 
 http_api {
     enabled         on;