LogalDeveloper/owncast
0
Fork 0
Code Activity

style fix for error checking (#1170)

Browse Source 
+additional linting
This commit is contained in:
Meisam
2021-07-09 20:16:44 +02:00
committed by GitHub
parent a13e1e75e2
commit 7361578412
22 changed files with 62 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/storageproviders/local.go
View File

@@ -32,16 +32,14 @@ func (s *LocalStorage) Setup() error {
// SegmentWritten is called when a single segment of video is written.
func (s *LocalStorage) SegmentWritten(localFilePath string) {
_, err := s.Save(localFilePath, 0)
if err != nil {
if _, err := s.Save(localFilePath, 0); err != nil {
log.Warnln(err)
}
}
// VariantPlaylistWritten is called when a variant hls playlist is written.
func (s *LocalStorage) VariantPlaylistWritten(localFilePath string) {
_, err := s.Save(localFilePath, 0)
if err != nil {
if _, err := s.Save(localFilePath, 0); err != nil {
log.Errorln(err)
return
}
@@ -49,8 +47,7 @@ func (s *LocalStorage) VariantPlaylistWritten(localFilePath string) {
// MasterPlaylistWritten is called when the master hls playlist is written.
func (s *LocalStorage) MasterPlaylistWritten(localFilePath string) {
_, err := s.Save(localFilePath, 0)
if err != nil {
if _, err := s.Save(localFilePath, 0); err != nil {
log.Warnln(err)
}
}

15
core/storageproviders/s3Storage.go
View File

@@ -74,8 +74,7 @@ func (s *S3Storage) SegmentWritten(localFilePath string) {
utils.StartPerformanceMonitor(performanceMonitorKey)
// Upload the segment
_, err := s.Save(localFilePath, 0)
if err != nil {
if _, err := s.Save(localFilePath, 0); err != nil {
log.Errorln(err)
return
}
@@ -92,8 +91,7 @@ func (s *S3Storage) SegmentWritten(localFilePath string) {
// so the segments and the HLS playlist referencing
// them are in sync.
playlistPath := filepath.Join(filepath.Dir(localFilePath), "stream.m3u8")
_, err = s.Save(playlistPath, 0)
if err != nil {
if _, err := s.Save(playlistPath, 0); err != nil {
_queuedPlaylistUpdates[playlistPath] = playlistPath
if pErr, ok := err.(*os.PathError); ok {
log.Debugln(pErr.Path, "does not yet exist locally when trying to upload to S3 storage.")
@@ -108,8 +106,7 @@ func (s *S3Storage) VariantPlaylistWritten(localFilePath string) {
// to make sure we're not referring to files in a playlist that don't
// yet exist. See SegmentWritten.
if _, ok := _queuedPlaylistUpdates[localFilePath]; ok {
_, err := s.Save(localFilePath, 0)
if err != nil {
if _, err := s.Save(localFilePath, 0); err != nil {
log.Errorln(err)
_queuedPlaylistUpdates[localFilePath] = localFilePath
}
@@ -120,8 +117,7 @@ func (s *S3Storage) VariantPlaylistWritten(localFilePath string) {
// MasterPlaylistWritten is called when the master hls playlist is written.
func (s *S3Storage) MasterPlaylistWritten(localFilePath string) {
// Rewrite the playlist to use absolute remote S3 URLs
err := s.rewriteRemotePlaylist(localFilePath)
if err != nil {
if err := s.rewriteRemotePlaylist(localFilePath); err != nil {
log.Warnln(err)
}
}
@@ -195,8 +191,7 @@ func (s *S3Storage) rewriteRemotePlaylist(filePath string) error {
}
p := m3u8.NewMasterPlaylist()
err = p.DecodeFrom(bufio.NewReader(f), false)
if err != nil {
if err := p.DecodeFrom(bufio.NewReader(f), false); err != nil {
log.Warnln(err)
}