external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

change conf to console without daemon.

Browse source
This commit is contained in:
winlin 2017-02-09 14:17:36 +08:00
parent 90ff579a83
commit 15570d93ce
31 changed files with 60 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/conf/bandwidth.conf
View file

@ -3,6 +3,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ { vhost __defaultVhost__ {
} }

2
trunk/conf/dvr.path.conf
View file

@ -5,6 +5,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ { vhost __defaultVhost__ {
dvr { dvr {
enabled on; enabled on;

2
trunk/conf/dvr.segment.conf
View file

@ -4,6 +4,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ { vhost __defaultVhost__ {
dvr { dvr {
enabled on; enabled on;

2
trunk/conf/dvr.session.conf
View file

@ -4,6 +4,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ { vhost __defaultVhost__ {
dvr { dvr {
enabled on; enabled on;

3
trunk/conf/edge.conf
View file

@ -5,7 +5,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
pid objs/edge.pid; pid objs/edge.pid;
srs_log_file ./objs/edge.log; daemon off;
srs_log_tank console;
vhost __defaultVhost__ { vhost __defaultVhost__ {
mode remote; mode remote;
origin 127.0.0.1:19350; origin 127.0.0.1:19350;

2
trunk/conf/edge.token.traverse.conf
View file

@ -4,6 +4,8 @@
listen 1935 listen 1935
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ { vhost __defaultVhost__ {
mode remote; mode remote;
origin 127.0.0.1:19350; origin 127.0.0.1:19350;

2
trunk/conf/ffmpeg.transcode.conf
View file

@ -4,6 +4,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ { vhost __defaultVhost__ {
transcode { transcode {
enabled on; enabled on;

4
trunk/conf/forward.master.conf
View file

@ -5,8 +5,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
pid ./objs/srs.master.pid; pid ./objs/srs.master.pid;
srs_log_tank file; daemon off;
srs_log_file ./objs/srs.master.log; srs_log_tank console;
vhost __defaultVhost__ { vhost __defaultVhost__ {
forward 127.0.0.1:19350; forward 127.0.0.1:19350;
} }

4
trunk/conf/forward.slave.conf
View file

@ -5,7 +5,7 @@
listen 19350; listen 19350;
max_connections 1000; max_connections 1000;
pid ./objs/srs.slave.pid; pid ./objs/srs.slave.pid;
srs_log_tank file; daemon off;
srs_log_file ./objs/srs.slave.log; srs_log_tank console;
vhost __defaultVhost__ { vhost __defaultVhost__ {
} }

2
trunk/conf/hds.conf
View file

@ -4,10 +4,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off; daemon off;
srs_log_tank console; srs_log_tank console;
srs_log_level trace;
vhost __defaultVhost__ { vhost __defaultVhost__ {
hds { hds {

2
trunk/conf/hls.conf
View file

@ -4,6 +4,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ { vhost __defaultVhost__ {
hls { hls {
enabled on; enabled on;

2
trunk/conf/http.aac.live.conf
View file

@ -4,6 +4,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
http_server { http_server {
enabled on; enabled on;
listen 8080; listen 8080;

2
trunk/conf/http.flv.live.conf
View file

@ -4,6 +4,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
http_server { http_server {
enabled on; enabled on;
listen 8080; listen 8080;

3
trunk/conf/http.flv.live.edge1.conf
View file

@ -5,7 +5,8 @@
listen 19351; listen 19351;
max_connections 1000; max_connections 1000;
pid objs/srs.flv.19351.pid; pid objs/srs.flv.19351.pid;
srs_log_file objs/srs.flv.19351.log; daemon off;
srs_log_tank console;
http_server { http_server {
enabled on; enabled on;
listen 8081; listen 8081;

3
trunk/conf/http.flv.live.edge2.conf
View file

@ -5,7 +5,8 @@
listen 19352; listen 19352;
max_connections 1000; max_connections 1000;
pid objs/srs.flv.19352.pid; pid objs/srs.flv.19352.pid;
srs_log_file objs/srs.flv.19352.log; daemon off;
srs_log_tank console;
http_server { http_server {
enabled on; enabled on;
listen 8082; listen 8082;

2
trunk/conf/http.heartbeat.conf
View file

@ -3,6 +3,8 @@
listen 1935 listen 1935
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
heartbeat { heartbeat {
enabled on; enabled on;
interval 9.3; interval 9.3;

2
trunk/conf/http.hls.conf
View file

@ -4,6 +4,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
http_server { http_server {
enabled on; enabled on;
listen 8080; listen 8080;

4
trunk/conf/http.hooks.callback.conf
View file

@ -3,8 +3,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
srs_log_tank file; daemon off;
srs_log_file ./objs/srs.log; srs_log_tank console;
vhost __defaultVhost__ { vhost __defaultVhost__ {
http_hooks { http_hooks {
enabled on; enabled on;

2
trunk/conf/http.mp3.live.conf
View file

@ -4,6 +4,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
http_server { http_server {
enabled on; enabled on;
listen 8080; listen 8080;

2
trunk/conf/http.server.conf
View file

@ -3,6 +3,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
http_server { http_server {
enabled on; enabled on;
listen 8080; listen 8080;

2
trunk/conf/http.ts.live.conf
View file

@ -4,6 +4,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
http_server { http_server {
enabled on; enabled on;
listen 8080; listen 8080;

2
trunk/conf/ingest.conf
View file

@ -4,6 +4,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ { vhost __defaultVhost__ {
ingest livestream { ingest livestream {
enabled on; enabled on;

4
trunk/conf/origin.conf
View file

@ -4,7 +4,7 @@
listen 19350; listen 19350;
max_connections 1000; max_connections 1000;
pid objs/origin.pid; daemon off;
srs_log_file ./objs/origin.log; srs_log_tank console;
vhost __defaultVhost__ { vhost __defaultVhost__ {
} }

2
trunk/conf/push.flv.conf
View file

@ -4,6 +4,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
http_server { http_server {
enabled on; enabled on;
listen 8080; listen 8080;

2
trunk/conf/push.mpegts.over.udp.conf
View file

@ -5,6 +5,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
stream_caster { stream_caster {
enabled on; enabled on;
caster mpegts_over_udp; caster mpegts_over_udp;

2
trunk/conf/push.rtsp.conf
View file

@ -5,6 +5,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
stream_caster { stream_caster {
enabled on; enabled on;
caster rtsp; caster rtsp;

2
trunk/conf/realtime.conf
View file

@ -4,6 +4,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ { vhost __defaultVhost__ {
gop_cache off; gop_cache off;
queue_length 10; queue_length 10;

2
trunk/conf/rtmp.conf
View file

@ -4,5 +4,7 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ { vhost __defaultVhost__ {
} }

2
trunk/conf/security.deny.publish.conf
View file

@ -4,6 +4,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ { vhost __defaultVhost__ {
security { security {
enabled on; enabled on;

2
trunk/conf/transcode2hls.audio.only.conf
View file

@ -4,6 +4,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ { vhost __defaultVhost__ {
hls { hls {
enabled on; enabled on;

2
trunk/conf/transform.edge.conf
View file

@ -4,6 +4,8 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ { vhost __defaultVhost__ {
} }
vhost source.srs.com { vhost source.srs.com {