From 15570d93ce3c744250613f2d4c7689878e7a8d26 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 9 Feb 2017 14:17:36 +0800 Subject: [PATCH] change conf to console without daemon. --- trunk/conf/bandwidth.conf | 2 ++ trunk/conf/dvr.path.conf | 2 ++ trunk/conf/dvr.segment.conf | 2 ++ trunk/conf/dvr.session.conf | 2 ++ trunk/conf/edge.conf | 3 ++- trunk/conf/edge.token.traverse.conf | 2 ++ trunk/conf/ffmpeg.transcode.conf | 2 ++ trunk/conf/forward.master.conf | 4 ++-- trunk/conf/forward.slave.conf | 4 ++-- trunk/conf/hds.conf | 2 -- trunk/conf/hls.conf | 2 ++ trunk/conf/http.aac.live.conf | 2 ++ trunk/conf/http.flv.live.conf | 2 ++ trunk/conf/http.flv.live.edge1.conf | 3 ++- trunk/conf/http.flv.live.edge2.conf | 3 ++- trunk/conf/http.heartbeat.conf | 2 ++ trunk/conf/http.hls.conf | 2 ++ trunk/conf/http.hooks.callback.conf | 4 ++-- trunk/conf/http.mp3.live.conf | 2 ++ trunk/conf/http.server.conf | 2 ++ trunk/conf/http.ts.live.conf | 2 ++ trunk/conf/ingest.conf | 2 ++ trunk/conf/origin.conf | 4 ++-- trunk/conf/push.flv.conf | 2 ++ trunk/conf/push.mpegts.over.udp.conf | 2 ++ trunk/conf/push.rtsp.conf | 2 ++ trunk/conf/realtime.conf | 2 ++ trunk/conf/rtmp.conf | 2 ++ trunk/conf/security.deny.publish.conf | 2 ++ trunk/conf/transcode2hls.audio.only.conf | 2 ++ trunk/conf/transform.edge.conf | 2 ++ 31 files changed, 60 insertions(+), 13 deletions(-) diff --git a/trunk/conf/bandwidth.conf b/trunk/conf/bandwidth.conf index 33ce199b7..a0bf06004 100644 --- a/trunk/conf/bandwidth.conf +++ b/trunk/conf/bandwidth.conf @@ -3,6 +3,8 @@ listen 1935; max_connections 1000; +daemon off; +srs_log_tank console; vhost __defaultVhost__ { } diff --git a/trunk/conf/dvr.path.conf b/trunk/conf/dvr.path.conf index 8ba6614a1..c5951f0db 100644 --- a/trunk/conf/dvr.path.conf +++ b/trunk/conf/dvr.path.conf @@ -5,6 +5,8 @@ listen 1935; max_connections 1000; +daemon off; +srs_log_tank console; vhost __defaultVhost__ { dvr { enabled on; diff --git a/trunk/conf/dvr.segment.conf b/trunk/conf/dvr.segment.conf index 1612597a4..2265ad07e 100644 --- a/trunk/conf/dvr.segment.conf +++ b/trunk/conf/dvr.segment.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/dvr.session.conf b/trunk/conf/dvr.session.conf index a7e0ae052..8e8d89351 100644 --- a/trunk/conf/dvr.session.conf +++ b/trunk/conf/dvr.session.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 f23203005..2a8662f3c 100644 --- a/trunk/conf/edge.conf +++ b/trunk/conf/edge.conf @@ -5,7 +5,8 @@ listen 1935; max_connections 1000; pid objs/edge.pid; -srs_log_file ./objs/edge.log; +daemon off; +srs_log_tank console; vhost __defaultVhost__ { mode remote; origin 127.0.0.1:19350; diff --git a/trunk/conf/edge.token.traverse.conf b/trunk/conf/edge.token.traverse.conf index f3e529e66..bad2412f7 100644 --- a/trunk/conf/edge.token.traverse.conf +++ b/trunk/conf/edge.token.traverse.conf @@ -4,6 +4,8 @@ listen 1935 max_connections 1000; +daemon off; +srs_log_tank console; vhost __defaultVhost__ { mode remote; origin 127.0.0.1:19350; 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 8283aac17..af6d502ed 100644 --- a/trunk/conf/forward.master.conf +++ b/trunk/conf/forward.master.conf @@ -5,8 +5,8 @@ listen 1935; max_connections 1000; pid ./objs/srs.master.pid; -srs_log_tank file; -srs_log_file ./objs/srs.master.log; +daemon off; +srs_log_tank console; vhost __defaultVhost__ { forward 127.0.0.1:19350; } diff --git a/trunk/conf/forward.slave.conf b/trunk/conf/forward.slave.conf index 37316c2f5..98286e33e 100644 --- a/trunk/conf/forward.slave.conf +++ b/trunk/conf/forward.slave.conf @@ -5,7 +5,7 @@ listen 19350; max_connections 1000; pid ./objs/srs.slave.pid; -srs_log_tank file; -srs_log_file ./objs/srs.slave.log; +daemon off; +srs_log_tank console; vhost __defaultVhost__ { } diff --git a/trunk/conf/hds.conf b/trunk/conf/hds.conf index 47811bcb7..c2a7d43ce 100644 --- a/trunk/conf/hds.conf +++ b/trunk/conf/hds.conf @@ -4,10 +4,8 @@ listen 1935; max_connections 1000; - daemon off; srs_log_tank console; -srs_log_level trace; vhost __defaultVhost__ { hds { diff --git a/trunk/conf/hls.conf b/trunk/conf/hls.conf index 8e1a09b65..d0fa42397 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; vhost __defaultVhost__ { hls { enabled on; diff --git a/trunk/conf/http.aac.live.conf b/trunk/conf/http.aac.live.conf index e3fdce78f..22aa1bda6 100644 --- a/trunk/conf/http.aac.live.conf +++ b/trunk/conf/http.aac.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.conf b/trunk/conf/http.flv.live.conf index 9b24ef0d3..944889fb7 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 4cc0de374..e827c221e 100644 --- a/trunk/conf/http.flv.live.edge1.conf +++ b/trunk/conf/http.flv.live.edge1.conf @@ -5,7 +5,8 @@ listen 19351; max_connections 1000; pid objs/srs.flv.19351.pid; -srs_log_file objs/srs.flv.19351.log; +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 c5ccef9b3..669c38037 100644 --- a/trunk/conf/http.flv.live.edge2.conf +++ b/trunk/conf/http.flv.live.edge2.conf @@ -5,7 +5,8 @@ listen 19352; max_connections 1000; pid objs/srs.flv.19352.pid; -srs_log_file objs/srs.flv.19352.log; +daemon off; +srs_log_tank console; http_server { enabled on; listen 8082; diff --git a/trunk/conf/http.heartbeat.conf b/trunk/conf/http.heartbeat.conf index b40287cfe..d15ff6a56 100644 --- a/trunk/conf/http.heartbeat.conf +++ b/trunk/conf/http.heartbeat.conf @@ -3,6 +3,8 @@ listen 1935 max_connections 1000; +daemon off; +srs_log_tank console; heartbeat { enabled on; interval 9.3; diff --git a/trunk/conf/http.hls.conf b/trunk/conf/http.hls.conf index 0b098779f..17416a294 100644 --- a/trunk/conf/http.hls.conf +++ b/trunk/conf/http.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/http.hooks.callback.conf b/trunk/conf/http.hooks.callback.conf index 06d636569..d5374d907 100644 --- a/trunk/conf/http.hooks.callback.conf +++ b/trunk/conf/http.hooks.callback.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; vhost __defaultVhost__ { http_hooks { enabled on; diff --git a/trunk/conf/http.mp3.live.conf b/trunk/conf/http.mp3.live.conf index 4962f8552..690a4539e 100644 --- a/trunk/conf/http.mp3.live.conf +++ b/trunk/conf/http.mp3.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.server.conf b/trunk/conf/http.server.conf index 69c94f39c..0c840894f 100644 --- a/trunk/conf/http.server.conf +++ b/trunk/conf/http.server.conf @@ -3,6 +3,8 @@ listen 1935; max_connections 1000; +daemon off; +srs_log_tank console; http_server { enabled on; listen 8080; diff --git a/trunk/conf/http.ts.live.conf b/trunk/conf/http.ts.live.conf index dd1b2be8e..d44567248 100644 --- a/trunk/conf/http.ts.live.conf +++ b/trunk/conf/http.ts.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/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/origin.conf b/trunk/conf/origin.conf index 121624611..287d4e98e 100644 --- a/trunk/conf/origin.conf +++ b/trunk/conf/origin.conf @@ -4,7 +4,7 @@ listen 19350; max_connections 1000; -pid objs/origin.pid; -srs_log_file ./objs/origin.log; +daemon off; +srs_log_tank console; vhost __defaultVhost__ { } diff --git a/trunk/conf/push.flv.conf b/trunk/conf/push.flv.conf index 63357df55..9e871f913 100644 --- a/trunk/conf/push.flv.conf +++ b/trunk/conf/push.flv.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/push.mpegts.over.udp.conf b/trunk/conf/push.mpegts.over.udp.conf index 65e6df358..82f2f04c8 100644 --- a/trunk/conf/push.mpegts.over.udp.conf +++ b/trunk/conf/push.mpegts.over.udp.conf @@ -5,6 +5,8 @@ listen 1935; max_connections 1000; +daemon off; +srs_log_tank console; stream_caster { enabled on; caster mpegts_over_udp; diff --git a/trunk/conf/push.rtsp.conf b/trunk/conf/push.rtsp.conf index 619f74d90..016a06796 100644 --- a/trunk/conf/push.rtsp.conf +++ b/trunk/conf/push.rtsp.conf @@ -5,6 +5,8 @@ listen 1935; max_connections 1000; +daemon off; +srs_log_tank console; stream_caster { enabled on; caster rtsp; diff --git a/trunk/conf/realtime.conf b/trunk/conf/realtime.conf index ac039c8e2..249c7501a 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__ { gop_cache off; queue_length 10; 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/security.deny.publish.conf b/trunk/conf/security.deny.publish.conf index 0c71bb9b2..fc2a2e809 100644 --- a/trunk/conf/security.deny.publish.conf +++ b/trunk/conf/security.deny.publish.conf @@ -4,6 +4,8 @@ listen 1935; max_connections 1000; +daemon off; +srs_log_tank console; vhost __defaultVhost__ { security { enabled on; diff --git a/trunk/conf/transcode2hls.audio.only.conf b/trunk/conf/transcode2hls.audio.only.conf index 21a1e42b8..f4361bfaa 100644 --- a/trunk/conf/transcode2hls.audio.only.conf +++ b/trunk/conf/transcode2hls.audio.only.conf @@ -4,6 +4,8 @@ listen 1935; max_connections 1000; +daemon off; +srs_log_tank console; vhost __defaultVhost__ { hls { enabled on; diff --git a/trunk/conf/transform.edge.conf b/trunk/conf/transform.edge.conf index 970af01c2..5b3a04f02 100644 --- a/trunk/conf/transform.edge.conf +++ b/trunk/conf/transform.edge.conf @@ -4,6 +4,8 @@ listen 1935; max_connections 1000; +daemon off; +srs_log_tank console; vhost __defaultVhost__ { } vhost source.srs.com {