uploader: add retry count

Author: luxcgo

engine/config/config.go

@@ -28,6 +28,8 @@ var DefaultConfig = Config{
 	// tv
 	DouyinCookie:   "default:__ac_nonce=06245c89100e7ab2dd536; __ac_signature=_02B4Z6wo00f01LjBMSAAAIDBwA.aJ.c4z1C44TWAAEx696;",
 	KuaishouCookie: "did=web_d86297aa2f579589b8abc2594b0ea985",
+
+	PostCmdsRetryCount: 2,
 }
 
 type Config struct {
@@ -44,6 +46,7 @@ type Config struct {
 	SplitRestSeconds         uint
 	CommanderPoolSize        uint
 	ParserMonitorRestSeconds uint
+	PostCmdsRetryCount       int
 
 	// tv
 	DouyinCookie   string

engine/uploader/uploader.go

@@ -5,6 +5,7 @@ import (
 	"os/exec"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/go-olive/olive/engine/config"
 	"github.com/sirupsen/logrus"
@@ -56,15 +57,26 @@ func (u *uploader) proc() {
 				"filepath":    u.taskGroup.Filepath,
 			}).Info("cmd start running")
 			handler := DefaultTaskMux.MustGetHandler(postCmd.Path)
-			err := handler.Process(
-				&Task{
-					log:      u.log,
-					cfg:      u.cfg,
-					Filepath: u.taskGroup.Filepath,
-					StopChan: u.stopChan,
-					Cmd:      postCmd,
-				},
-			)
+
+			retryCnt := u.cfg.PostCmdsRetryCount
+			var err error
+			for i := 0; i <= retryCnt; i++ {
+				if i != 0 {
+					time.Sleep(time.Minute)
+				}
+				err = handler.Process(
+					&Task{
+						log:      u.log,
+						cfg:      u.cfg,
+						Filepath: u.taskGroup.Filepath,
+						StopChan: u.stopChan,
+						Cmd:      postCmd,
+					},
+				)
+				if err == nil {
+					break
+				}
+			}
 			if err != nil {
 				u.log.WithFields(logrus.Fields{
 					"postCmdPath": postCmd.Path,

zarf/tmpl/config.toml

@@ -15,6 +15,7 @@ BiliupEnable = false
 CookieFilepath = '/Users/lucas/github/olive/cookies.json'
 Threads = 6
 MaxBytesPerSecond = 2097152
+PostCmdsRetryCount = 2
 
 [[Shows]]
 ID = 'a'
@@ -26,4 +27,4 @@ OutTmpl = '[{{ .StreamerName }}][{{ .RoomName }}][{{ now | date "2006-01-02 15-0
 Parser = 'flv'
 SaveDir = ''
 PostCmds = '[{"Path":"oliveshell","Args":["/bin/zsh","-c","echo $FILE_PATH"]},{"Path":"olivebiliup"},{"Path":"olivetrash"}]'
-SplitRule = '{"FileSize":2000000000,"Duration":"1h"}'
+SplitRule = '{"FileSize":2000000000,"Duration":"1h"}'