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/ffmpeg/fileWriterReceiverService.go
View File

@@ -60,14 +60,14 @@ func (s *FileWriterReceiverService) uploadHandler(w http.ResponseWriter, r *http
f, err := os.Create(writePath)
if err != nil {
returnError(err, w, r)
returnError(err, w)
return
}
defer f.Close()
_, err = f.Write(data)
if err != nil {
returnError(err, w, r)
returnError(err, w)
return
}
@@ -82,7 +82,6 @@ func (s *FileWriterReceiverService) fileWritten(path string) {
if utils.GetRelativePathFromAbsolutePath(path) == "hls/stream.m3u8" {
s.callbacks.MasterPlaylistWritten(path)
} else if strings.HasSuffix(path, ".ts") {
performanceMonitorKey := "segmentWritten-" + index
averagePerformance := utils.GetAveragePerformance(performanceMonitorKey)
@@ -98,13 +97,12 @@ func (s *FileWriterReceiverService) fileWritten(path string) {
} else {
_inWarningState = false
}
} else if strings.HasSuffix(path, ".m3u8") {
s.callbacks.VariantPlaylistWritten(path)
}
}
func returnError(err error, w http.ResponseWriter, r *http.Request) {
func returnError(err error, w http.ResponseWriter) {
log.Errorln(err)
http.Error(w, http.StatusText(http.StatusInternalServerError)+": "+err.Error(), http.StatusInternalServerError)
}