Variable collisions; Possible use of nil value (#256)
* 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:
parent
3812e6345f
commit
bfbac8cc57
@ -9,8 +9,8 @@ import (
|
||||
|
||||
// GetHardwareStats will return hardware utilization over time
|
||||
func GetHardwareStats(w http.ResponseWriter, r *http.Request) {
|
||||
metrics := metrics.Metrics
|
||||
m := metrics.Metrics
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
json.NewEncoder(w).Encode(metrics)
|
||||
json.NewEncoder(w).Encode(m)
|
||||
}
|
||||
|
@ -15,13 +15,13 @@ import (
|
||||
|
||||
// Make this path configurable if somebody has a valid reason
|
||||
// to need it to be. The config is getting a bit bloated.
|
||||
const emojiPath = "/img/emoji" // Relative to webroot
|
||||
const emojiDir = "/img/emoji" // Relative to webroot
|
||||
|
||||
//GetCustomEmoji returns a list of custom emoji via the API
|
||||
func GetCustomEmoji(w http.ResponseWriter, r *http.Request) {
|
||||
emojiList := make([]models.CustomEmoji, 0)
|
||||
|
||||
fullPath := filepath.Join(config.WebRoot, emojiPath)
|
||||
fullPath := filepath.Join(config.WebRoot, emojiDir)
|
||||
files, err := ioutil.ReadDir(fullPath)
|
||||
if err != nil {
|
||||
log.Errorln(err)
|
||||
@ -34,8 +34,8 @@ func GetCustomEmoji(w http.ResponseWriter, r *http.Request) {
|
||||
// the server to add emoji?
|
||||
for _, f := range files {
|
||||
name := strings.TrimSuffix(f.Name(), path.Ext(f.Name()))
|
||||
path := filepath.Join(emojiPath, f.Name())
|
||||
singleEmoji := models.CustomEmoji{name, path}
|
||||
emojiPath := filepath.Join(emojiDir, f.Name())
|
||||
singleEmoji := models.CustomEmoji{name, emojiPath}
|
||||
emojiList = append(emojiList, singleEmoji)
|
||||
}
|
||||
|
||||
|
@ -64,7 +64,13 @@ func handleScraperMetadataPage(w http.ResponseWriter, r *http.Request) {
|
||||
tmpl := template.Must(template.ParseFiles(path.Join("static", "metadata.html")))
|
||||
|
||||
fullURL, err := url.Parse(fmt.Sprintf("http://%s%s", r.Host, r.URL.Path))
|
||||
if err != nil {
|
||||
log.Panicln(err)
|
||||
}
|
||||
imageURL, err := url.Parse(fmt.Sprintf("http://%s%s", r.Host, config.Config.InstanceDetails.Logo.Large))
|
||||
if err != nil {
|
||||
log.Panicln(err)
|
||||
}
|
||||
|
||||
status := core.GetStatus()
|
||||
|
||||
@ -74,8 +80,10 @@ func handleScraperMetadataPage(w http.ResponseWriter, r *http.Request) {
|
||||
thumbnail, err := url.Parse(fmt.Sprintf("http://%s%s", r.Host, "/thumbnail.jpg"))
|
||||
if err != nil {
|
||||
log.Errorln(err)
|
||||
thumbnailURL = imageURL.String()
|
||||
} else {
|
||||
thumbnailURL = thumbnail.String()
|
||||
}
|
||||
thumbnailURL = thumbnail.String()
|
||||
} else {
|
||||
thumbnailURL = imageURL.String()
|
||||
}
|
||||
|
@ -50,6 +50,9 @@ func createTable(db *sql.DB) {
|
||||
|
||||
func addMessage(message models.ChatMessage) {
|
||||
tx, err := _db.Begin()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
stmt, err := tx.Prepare("INSERT INTO messages(id, author, body, messageType, visible, timestamp) values(?, ?, ?, ?, ?, ?)")
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
|
@ -69,9 +69,9 @@ func (v *VideoSize) getString() string {
|
||||
|
||||
func (t *Transcoder) Stop() {
|
||||
log.Traceln("Transcoder STOP requested.")
|
||||
error := _commandExec.Process.Kill()
|
||||
if error != nil {
|
||||
log.Errorln(error)
|
||||
err := _commandExec.Process.Kill()
|
||||
if err != nil {
|
||||
log.Errorln(err)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -34,8 +34,8 @@ func Start() {
|
||||
port := 1935
|
||||
s := rtmp.NewServer()
|
||||
var lis net.Listener
|
||||
var error error
|
||||
if lis, error = net.Listen("tcp", fmt.Sprintf(":%d", port)); error != nil {
|
||||
var err error
|
||||
if lis, err = net.Listen("tcp", fmt.Sprintf(":%d", port)); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
@ -46,8 +46,8 @@ func Start() {
|
||||
|
||||
s.HandleConn = HandleConn
|
||||
|
||||
if error != nil {
|
||||
log.Panicln(error)
|
||||
if err != nil {
|
||||
log.Panicln(err)
|
||||
}
|
||||
log.Infof("RTMP server is listening for incoming stream on port: %d", port)
|
||||
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
|
@ -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)
|
||||
|
@ -74,10 +74,10 @@ func SetStreamAsDisconnected() {
|
||||
|
||||
if utils.DoesFileExists(playlistFilePath) {
|
||||
f, err := os.OpenFile(playlistFilePath, os.O_CREATE|os.O_RDWR, os.ModePerm)
|
||||
defer f.Close()
|
||||
if err != nil {
|
||||
log.Errorln(err)
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
playlist, _, err := m3u8.DecodeFrom(bufio.NewReader(f), true)
|
||||
variantPlaylist := playlist.(*m3u8.MediaPlaylist)
|
||||
|
Loading…
Reference in New Issue
Block a user