LogalDeveloper/owncast
0
Fork 0
Code Activity

Variable collisions; Possible use of nil value (#256)

Browse Source 
* Variable '*' collides with imported package name

* Variable 'error' collides with builtin interface

* '*' may have 'nil' or other unexpected value as its corresponding error variable may be not 'nil'
This commit is contained in:
bitspill
2020-10-16 15:04:31 -07:00
committed by GitHub
parent 3812e6345f
commit bfbac8cc57
10 changed files with 41 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/storageproviders/local.go
View File

@@ -40,9 +40,9 @@ func (s *LocalStorage) SegmentWritten(localFilePath string) {
// VariantPlaylistWritten is called when a variant hls playlist is written
func (s *LocalStorage) VariantPlaylistWritten(localFilePath string) {
_, error := s.Save(localFilePath, 0)
if error != nil {
log.Errorln(error)
_, err := s.Save(localFilePath, 0)
if err != nil {
log.Errorln(err)
return
}
}

22
core/storageproviders/s3Storage.go
View File

@@ -72,9 +72,9 @@ func (s *S3Storage) SegmentWritten(localFilePath string) {
utils.StartPerformanceMonitor(performanceMonitorKey)
// Upload the segment
_, error := s.Save(localFilePath, 0)
if error != nil {
log.Errorln(error)
_, err := s.Save(localFilePath, 0)
if err != nil {
log.Errorln(err)
return
}
averagePerformance := utils.GetAveragePerformance(performanceMonitorKey)
@@ -89,11 +89,11 @@ func (s *S3Storage) SegmentWritten(localFilePath string) {
// Upload the variant playlist for this segment
// so the segments and the HLS playlist referencing
// them are in sync.
playlist := filepath.Join(filepath.Dir(localFilePath), "stream.m3u8")
_, error = s.Save(playlist, 0)
if error != nil {
_queuedPlaylistUpdates[playlist] = playlist
if pErr, ok := error.(*os.PathError); ok {
playlistPath := filepath.Join(filepath.Dir(localFilePath), "stream.m3u8")
_, err = s.Save(playlistPath, 0)
if 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.")
return
}
@@ -106,9 +106,9 @@ func (s *S3Storage) VariantPlaylistWritten(localFilePath string) {
// to make sure we're not refering to files in a playlist that don't
// yet exist. See SegmentWritten.
if _, ok := _queuedPlaylistUpdates[localFilePath]; ok {
_, error := s.Save(localFilePath, 0)
if error != nil {
log.Errorln(error)
_, err := s.Save(localFilePath, 0)
if err != nil {
log.Errorln(err)
_queuedPlaylistUpdates[localFilePath] = localFilePath
}
delete(_queuedPlaylistUpdates, localFilePath)