LogalDeveloper/owncast
0
Fork 0
Code Activity

Start cleaning up linter errors. (#358)

Browse Source 
* Start cleaning up linter errors. For #357

* Fix unmarshalling NullTime values

* More linter fixes

* Remove commented code

* Move defer up

* Consolidate error check lines

* Move error check to make sure row iteration was successful

* Cleaner error check + do not recreate pipe if it exists

* Consolidate hashing to generate client id
This commit is contained in:
Gabe Kangas
2020-11-14 18:39:53 -08:00
committed by GitHub
parent c76b7229a5
commit 4d2066a76d
34 changed files with 248 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/rtmp/rtmp.go
View File

@@ -90,7 +90,12 @@ func HandleConn(c *rtmp.Conn, nc net.Conn) {
log.Infoln("Incoming RTMP connected.")
pipePath := utils.GetTemporaryPipePath()
syscall.Mkfifo(pipePath, 0666)
if !utils.DoesFileExists(pipePath) {
err := syscall.Mkfifo(pipePath, 0666)
if err != nil {
log.Fatalln(err)
}
}
_hasInboundRTMPConnection = true
_setStreamAsConnected()
@@ -119,7 +124,6 @@ func HandleConn(c *rtmp.Conn, nc net.Conn) {
panic(err)
}
}
}
func handleDisconnect(conn net.Conn) {

6
core/rtmp/utils.go
View File

@@ -6,8 +6,8 @@ import (
"fmt"
"regexp"
"github.com/owncast/owncast/models"
"github.com/nareix/joy5/format/flv/flvio"
"github.com/owncast/owncast/models"
)
func getInboundDetailsFromMetadata(metadata []interface{}) (models.RTMPStreamMetadata, error) {
@@ -21,8 +21,8 @@ func getInboundDetailsFromMetadata(metadata []interface{}) (models.RTMPStreamMet
metadataJSONString := submatchall[0]
var details models.RTMPStreamMetadata
json.Unmarshal([]byte(metadataJSONString), &details)
return details, nil
err := json.Unmarshal([]byte(metadataJSONString), &details)
return details, err
}
func getAudioCodec(codec interface{}) string {