apps/core
1
0
Fork 0
mirror of https://github.com/datarhei/core.git synced 2025-10-08 17:30:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use IAM for placeholders, simplify proxy nodes

Browse Source
This commit is contained in:
Ingo Oppermann
2023-05-31 21:49:25 +02:00
parent 401156e4d2
commit f21ca2055e
6 changed files with 198 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtmp/rtmp.go
View File

@@ -277,13 +277,16 @@ func (s *server) handlePlay(conn *rtmp.Conn) {
if ch == nil {
// Check in the cluster for that stream
url, err := s.proxy.GetURL("rtmp:" + conn.URL.Path)
url, err := s.proxy.GetURL("rtmp", conn.URL.Path)
if err != nil {
s.log(identity, "PLAY", "NOTFOUND", conn.URL.Path, "", remote)
return
}
src, err := avutil.Open(url)
url.JoinPath(token)
peerurl := url.String()
src, err := avutil.Open(peerurl)
if err != nil {
s.logger.Error().WithField("address", url).WithError(err).Log("Proxying address failed")
s.log(identity, "PLAY", "NOTFOUND", conn.URL.Path, "", remote)
@@ -296,13 +299,13 @@ func (s *server) handlePlay(conn *rtmp.Conn) {
wg.Add(1)
go func() {
s.log(identity, "PLAY", "PROXYSTART", url, "", remote)
s.log(identity, "PLAY", "PROXYSTART", peerurl, "", remote)
wg.Done()
err := s.publish(c, playpath, remote, identity, true)
if err != nil {
s.logger.Error().WithField("address", url).WithError(err).Log("Proxying address failed")
}
s.log(identity, "PLAY", "PROXYSTOP", url, "", remote)
s.log(identity, "PLAY", "PROXYSTOP", peerurl, "", remote)
}()
// Wait for the goroutine to start