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

support dead-loop detect for forwarder and transcoder.

Browse source
This commit is contained in:
winlin 2013-12-01 17:32:06 +08:00
parent e4ea965a3a
commit 6af0794bab
17 changed files with 246 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

28
trunk/conf/srs.conf
View file

@ -41,7 +41,7 @@ vhost __defaultVhost__ {
achannels 2;
aparams {
}
output rtmp://[vhost]:[port]/[app]/[stream]_ld;
output rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine];
}
engine sd{
enabled on;
@ -64,7 +64,7 @@ vhost __defaultVhost__ {
achannels 2;
aparams {
}
output rtmp://[vhost]:[port]/[app]/[stream]_sd;
output rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine];
}
}
}
@ -76,7 +76,7 @@ vhost dev {
hls_path ./objs/nginx/html;
hls_fragment 5;
hls_window 30;
#forward dev:19350;
forward 127.0.0.1:19350?vhost=dev;
transcode {
enabled on;
ffmpeg ./objs/ffmpeg/bin/ffmpeg;
@ -100,7 +100,7 @@ vhost dev {
achannels 2;
aparams {
}
output rtmp://127.0.0.1:[port]/[app]/[stream]_dev;
output rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine];
}
}
}
@ -130,7 +130,7 @@ vhost mirror.transcode.vhost.com {
achannels 2;
aparams {
}
output rtmp://[vhost]:[port]/[app]/[stream]_mirror;
output rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine];
}
}
}
@ -160,7 +160,7 @@ vhost drawtext.transcode.vhost.com {
achannels 2;
aparams {
}
output rtmp://[vhost]:[port]/[app]/[stream]_drawtext;
output rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine];
}
}
}
@ -190,7 +190,7 @@ vhost crop.transcode.vhost.com {
achannels 2;
aparams {
}
output rtmp://[vhost]:[port]/[app]/[stream]_crop;
output rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine];
}
}
}
@ -220,7 +220,7 @@ vhost logo.transcode.vhost.com {
achannels 2;
aparams {
}
output rtmp://[vhost]:[port]/[app]/[stream]_logo;
output rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine];
}
}
}
@ -297,7 +297,8 @@ vhost all.transcode.vhost.com {
# [port] the intput stream port.
# [app] the input stream app.
# [stream] the input stream name.
output rtmp://[vhost]:[port]/[app]/[stream]_ffsuper;
# [engine] the tanscode engine name.
output rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine];
}
engine ffhd{
enabled on;
@ -418,15 +419,14 @@ vhost forward.vhost.com {
# this used to split/forward the current stream for cluster active-standby,
# active-active for cdn to build high available fault tolerance system.
# format: {ip}:{port} {ip_N}:{port_N}
# or specify the vhost by:
# format: {ip}:{port}?vhost={vhost} {ip_N}:{port_N}?vhost={vhost}
# if vhost not specified, use the request vhost instead.
forward 127.0.0.1:1936 127.0.0.1:1937;
}
# the vhost which forward publish streams to other vhosts.
vhost forward1.vhost.com {
# forward all publish stream to the specified server.
# this used to split/forward the current stream for cluster active-standby,
# active-active for cdn to build high available fault tolerance system.
# format: {ip}:{port} {ip_N}:{port_N}
forward forward.vhost.com:1936 forward.vhost.com:1937;
forward 127.0.0.1:1936?vhost=forward2.vhost.com 127.0.0.1:1937?vhost=forward3.vhost.com;
}
# the vhost disabled.
vhost removed.vhost.com {