From 6300382516c175312aea62f4ad35e136971967db Mon Sep 17 00:00:00 2001 From: Misty Date: Thu, 29 Oct 2020 21:42:51 +0800 Subject: [PATCH] Fix format errors --- live/videoworker/downloader/provgo/downloaderGoHLS.go | 2 +- live/videoworker/downloader/provgo/downloaderGoHLSAlt.go | 2 +- live/videoworker/downloader/provgo/downloaderGoHttp.go | 2 +- live/videoworker/videoProcesser.go | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/live/videoworker/downloader/provgo/downloaderGoHLS.go b/live/videoworker/downloader/provgo/downloaderGoHLS.go index 759b471..2fc4f10 100644 --- a/live/videoworker/downloader/provgo/downloaderGoHLS.go +++ b/live/videoworker/downloader/provgo/downloaderGoHLS.go @@ -381,7 +381,7 @@ func (d *HLSDownloader) m3u8Handler(isAlt bool) error { var curHeader map[string]string curUrl, curHeader = d.getHLSUrl(isAlt) if curUrl == "" { - logger.Infof("got empty m3u8 url", curUrl) + logger.Infof("got empty m3u8 url") d.forceRefresh(isAlt) time.Sleep(10 * time.Second) return nil diff --git a/live/videoworker/downloader/provgo/downloaderGoHLSAlt.go b/live/videoworker/downloader/provgo/downloaderGoHLSAlt.go index b376ef7..caff0fc 100644 --- a/live/videoworker/downloader/provgo/downloaderGoHLSAlt.go +++ b/live/videoworker/downloader/provgo/downloaderGoHLSAlt.go @@ -361,7 +361,7 @@ func (d *HLSDownloader) AltWriter() { max = v.(int) } } - d.Logger.Infof("Got tail segs: %s, key max: %d, min %d", segs, max, min) + d.Logger.Infof("Got tail segs: %v, key max: %d, min %d", segs, max, min) // sometimes the cdn will reset everything back to 1 and then restart, so after wrote the // last segments, we try to write the first parts diff --git a/live/videoworker/downloader/provgo/downloaderGoHttp.go b/live/videoworker/downloader/provgo/downloaderGoHttp.go index 777af49..009176b 100644 --- a/live/videoworker/downloader/provgo/downloaderGoHttp.go +++ b/live/videoworker/downloader/provgo/downloaderGoHttp.go @@ -78,7 +78,7 @@ func doDownloadHttp(entry *log.Entry, output string, url string, headers map[str } //written, err := io.CopyBuffer(out, resp.Body, buf) - entry.Infof("Wrote %s, err: %s", written, err) + entry.Infof("Wrote %d, err: %s", written, err) if err == nil { return nil } else if err == io.EOF { diff --git a/live/videoworker/videoProcesser.go b/live/videoworker/videoProcesser.go index 858c1d9..be4edab 100644 --- a/live/videoworker/videoProcesser.go +++ b/live/videoworker/videoProcesser.go @@ -275,9 +275,9 @@ func (p *ProcessVideo) postProcessing() string { err = utils.MoveFiles(src, dst) if err != nil { if !quiet { - logger.WithError(err).Warn("Failed to rename from [%s] to [%s]!", src, dst) + logger.WithError(err).Warnf("Failed to rename from [%s] to [%s]!", src, dst) } else { - logger.WithError(err).Info("Post renaming from [%s] to [%s] failed!", src, dst) + logger.WithError(err).Infof("Post renaming from [%s] to [%s] failed!", src, dst) } } else { logger.Infof("Renamed %s to %s", src, dst) @@ -306,7 +306,7 @@ func (p *ProcessVideo) convertToMp4(dirpath string) string { title := p.getFullTitle() var videoName string if len(p.videoPathList) == 0 { - log.Warnf("videoPathList is empty!!!! full info: %s", p) + log.Warnf("videoPathList is empty!!!! full info: %v", p) } else if len(p.videoPathList) > 1 { mergedName := utils.ChangeName(title + "_merged.mp4") mergedPath := dirpath + "/" + mergedName