summaryrefslogtreecommitdiff
path: root/recording
diff options
context:
space:
mode:
authorKeuin <[email protected]>2022-09-08 03:33:41 +0800
committerKeuin <[email protected]>2022-09-08 03:33:41 +0800
commitee451cbd950f82abf1df3d5e49ad74fbe9a53aa8 (patch)
treed10ed9a5499d9c588e873a25cdb5d99913640f2c /recording
parenteaa1547b10f439a037866cee054a7810567aa6fc (diff)
Add watch restart sleep.
Diffstat (limited to 'recording')
-rw-r--r--recording/config.go5
-rw-r--r--recording/runner.go22
2 files changed, 23 insertions, 4 deletions
diff --git a/recording/config.go b/recording/config.go
index 975887b..6d8704b 100644
--- a/recording/config.go
+++ b/recording/config.go
@@ -9,6 +9,7 @@ type TaskConfig struct {
RoomId common.RoomId `mapstructure:"room_id"`
Transport TransportConfig `mapstructure:"transport"`
Download DownloadConfig `mapstructure:"download"`
+ Watch WatchConfig `mapstructure:"watch"`
}
type TransportConfig struct {
@@ -22,6 +23,10 @@ type DownloadConfig struct {
DiskWriteBufferBytes int `mapstructure:"disk_write_buffer_bytes"`
}
+type WatchConfig struct {
+ LiveInterruptedRestartSleepSeconds int `mapstructure:"live_interrupted_restart_sleep_seconds"`
+}
+
func DefaultTransportConfig() TransportConfig {
return TransportConfig{
SocketTimeoutSeconds: 10,
diff --git a/recording/runner.go b/recording/runner.go
index c95e559..487cab8 100644
--- a/recording/runner.go
+++ b/recording/runner.go
@@ -87,9 +87,22 @@ func doTask(ctx context.Context, task *TaskConfig) error {
}
go func() {
cancelled := false
+ var err2 error
// restart recorder if interrupted by I/O errors
for !cancelled {
- cancelled = record(recorderCtx, bi, task)
+ cancelled, err2 = record(recorderCtx, bi, task)
+ if err2 == bilibili.ErrRoomIsClosed {
+ sec := task.Watch.LiveInterruptedRestartSleepSeconds
+ if sec == 0 {
+ // default: 3s
+ // TODO move this to default config value (not easily supported by viper)
+ time.Sleep(3 * time.Second)
+ }
+ if sec > 0 {
+ logger.Printf("Sleep for %vs before restart recording.\n", sec)
+ time.Sleep(time.Duration(sec) * time.Second)
+ }
+ }
}
logger.Printf("Task is cancelled. Stop recording. (room %v)\n", task.RoomId)
}()
@@ -106,7 +119,7 @@ func record(
ctx context.Context,
bi bilibili.Bilibili,
task *TaskConfig,
-) (cancelled bool) {
+) (cancelled bool, err error) {
logger := log.Default()
logger.Printf("INFO: Getting room profile...\n")
@@ -149,8 +162,8 @@ func record(
return
}
if len(urlInfo.Data.URLs) == 0 {
- j, err := json.Marshal(urlInfo)
- if err != nil {
+ j, err2 := json.Marshal(urlInfo)
+ if err2 != nil {
j = []byte("(not available)")
}
logger.Printf("ERROR: No stream returned from API. Response: %v", string(j))
@@ -182,6 +195,7 @@ func record(
logger.Printf("Failed to flush buffered file write data: %v\n", err)
}
}()
+ logger.Printf("Write buffer size: %v byte\n", fWriter.Size())
logger.Printf("Recording live stream to file \"%v\"...", filePath)
err = bi.CopyLiveStream(ctx, task.RoomId, streamSource, fWriter)