External/mediamtx
1
0
Fork 1
mirror of https://github.com/bluenviron/mediamtx.git synced 2025-12-25 04:22:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

new environment variable RTSP_PORT

Browse source
This commit is contained in:
aler9 2020-11-01 17:33:06 +01:00
parent 93f6687ad9
commit bbc2401ac2
10 changed files with 95 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

24
externalcmd/externalcmd.go
View file

@ -12,10 +12,15 @@ const (
retryPause = 5 * time.Second
)
type Environment struct {
Path string
Port string
}
type ExternalCmd struct {
cmdstr string
restart bool
pathName string
cmdstr string
restart bool
env Environment
// in
terminate chan struct{}
@ -24,11 +29,11 @@ type ExternalCmd struct {
done chan struct{}
}
func New(cmdstr string, restart bool, pathName string) *ExternalCmd {
func New(cmdstr string, restart bool, env Environment) *ExternalCmd {
e := &ExternalCmd{
cmdstr: cmdstr,
restart: restart,
pathName: pathName,
env: env,
terminate: make(chan struct{}),
done: make(chan struct{}),
}
@ -79,16 +84,19 @@ func (e *ExternalCmd) runInner() bool {
// on Windows the shell is not used and command is started directly
// variables are replaced manually in order to guarantee compatibility
// with Linux commands
args := strings.Fields(strings.ReplaceAll(e.cmdstr, "$RTSP_PATH", e.pathName))
tmp := strings.ReplaceAll(e.cmdstr, "$RTSP_PATH", e.env.Path)
tmp = strings.ReplaceAll(tmp, "$RTSP_PORT", e.env.Port)
args := strings.Fields(tmp)
cmd = exec.Command(args[0], args[1:]...)
} else {
cmd = exec.Command("/bin/sh", "-c", "exec "+e.cmdstr)
}
// variables are inserted into the environment
cmd.Env = append(os.Environ(),
"RTSP_PATH="+e.pathName,
"RTSP_PATH="+e.env.Path,
"RTSP_PORT="+e.env.Port,
)
cmd.Stdout = os.Stdout