Compare commits

..

2 Commits

Author SHA1 Message Date
langhuihui
2d1acf6219 fix: engine Run func 2023-08-21 14:52:29 +08:00
langhuihui
ad5e017c16 feat: engine subscribe config add syncMode, hls plugin add preload mode, fatal.log now can gen more files in the dir
fix: record panic when stop

desc: 引擎的 Subscribe 配置增加同步模式,hls 插件增加预加载模式,修复录制停止时 panic 的问题
错误日志将会生成多个文件,在一个 fatal 目录下
2023-08-18 18:17:08 +08:00
2 changed files with 28 additions and 21 deletions

15
go.mod
View File

@@ -4,21 +4,21 @@ go 1.20
require (
go.uber.org/zap v1.24.0
m7s.live/engine/v4 v4.13.9
m7s.live/plugin/debug/v4 v4.0.0
m7s.live/engine/v4 v4.13.10-0.20230821065056-3d14717f69e6
m7s.live/plugin/debug/v4 v4.0.1
m7s.live/plugin/edge/v4 v4.0.6
m7s.live/plugin/fmp4/v4 v4.0.4
m7s.live/plugin/gb28181/v4 v4.4.0
m7s.live/plugin/hdl/v4 v4.1.8
m7s.live/plugin/hls/v4 v4.3.3
m7s.live/plugin/hls/v4 v4.3.4-0.20230817113507-51b0e32d8468
m7s.live/plugin/hook/v4 v4.0.2
m7s.live/plugin/jessica/v4 v4.2.1
m7s.live/plugin/logrotate/v4 v4.0.4
m7s.live/plugin/monitor/v4 v4.0.3
m7s.live/plugin/preview/v4 v4.1.2
m7s.live/plugin/record/v4 v4.4.1
m7s.live/plugin/record/v4 v4.4.2-0.20230818060709-6c289bbcd27f
m7s.live/plugin/room/v4 v4.0.11
m7s.live/plugin/rtmp/v4 v4.2.5
m7s.live/plugin/rtmp/v4 v4.2.6-0.20230817113543-91af4e990e99
m7s.live/plugin/rtsp/v4 v4.2.6
m7s.live/plugin/snap/v4 v4.0.7
m7s.live/plugin/webrtc/v4 v4.2.1
@@ -80,7 +80,8 @@ require (
github.com/quic-go/qtls-go1-20 v0.3.1 // indirect
github.com/quic-go/quic-go v0.37.4 // indirect
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b // indirect
github.com/shirou/gopsutil/v3 v3.22.11 // indirect
github.com/shirou/gopsutil/v3 v3.23.7 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/stretchr/testify v1.8.4 // indirect
github.com/tevino/abool v1.2.0 // indirect
@@ -88,7 +89,7 @@ require (
github.com/tklauser/numcpus v0.6.0 // indirect
github.com/x-cray/logrus-prefixed-formatter v0.5.2 // indirect
github.com/yapingcat/gomedia v0.0.0-20230727105416-c491e66c9d2a // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
github.com/yusufpapurcu/wmi v1.2.3 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/crypto v0.11.0 // indirect

34
go.sum
View File

@@ -213,8 +213,12 @@ github.com/quic-go/quic-go v0.37.4/go.mod h1:YsbH1r4mSHPJcLF4k4zruUkLBqctEMBDR6V
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b h1:gQZ0qzfKHQIybLANtM3mBXNUtOfsCFXeTsnBqCsx1KM=
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
github.com/shirou/gopsutil/v3 v3.22.11 h1:kxsPKS+Eeo+VnEQ2XCaGJepeP6KY53QoRTETx3+1ndM=
github.com/shirou/gopsutil/v3 v3.22.11/go.mod h1:xl0EeL4vXJ+hQMAGN8B9VFpxukEMA0XdevQOe5MZ1oY=
github.com/shirou/gopsutil/v3 v3.23.7 h1:C+fHO8hfIppoJ1WdsVm1RoI0RwXoNdfTK7yWXV0wVj4=
github.com/shirou/gopsutil/v3 v3.23.7/go.mod h1:c4gnmoRC0hQuaLqvxnx1//VXQ0Ms/X9UnJF8pddY5z4=
github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
@@ -253,8 +257,8 @@ github.com/yapingcat/gomedia v0.0.0-20230727105416-c491e66c9d2a/go.mod h1:WSZ59b
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw=
github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
@@ -412,10 +416,12 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
m7s.live/engine/v4 v4.13.9 h1:XttLwLQQQSDDZ/oPiAs1jR6pUrd7ERpPk1CyBbjYCOk=
m7s.live/engine/v4 v4.13.9/go.mod h1:k/6iFSuJxmhJL8VO45NAga8BbgZHLLfRXOwCcCzk2s8=
m7s.live/plugin/debug/v4 v4.0.0 h1:yVFI/XB/EwR9NyihwvTIC/tocibPdE/NQZjDnOtRq/M=
m7s.live/plugin/debug/v4 v4.0.0/go.mod h1:A/C1ViacCOK7EPeeCfiwlUrC2TUtRdEqzrR0Yd9b1KQ=
m7s.live/engine/v4 v4.13.10-0.20230821004541-3fac2cd570f0 h1:cwzjfkFMKLkEDs6V13+BsnuyuQg0oWXX37biIpNS06w=
m7s.live/engine/v4 v4.13.10-0.20230821004541-3fac2cd570f0/go.mod h1:Wfs3OMgtRxLIbw1nCjWFgo1kRkypg6L+38QLghMG6Vw=
m7s.live/engine/v4 v4.13.10-0.20230821065056-3d14717f69e6 h1:WMlAMGRxkvBXjpCet6MgjIg0Obt2KpxQn1QrrzcSCnQ=
m7s.live/engine/v4 v4.13.10-0.20230821065056-3d14717f69e6/go.mod h1:Wfs3OMgtRxLIbw1nCjWFgo1kRkypg6L+38QLghMG6Vw=
m7s.live/plugin/debug/v4 v4.0.1 h1:sX0UADsiikwSol8qx+8aQzGeaFa8yJFa/cUKpBs5Lzw=
m7s.live/plugin/debug/v4 v4.0.1/go.mod h1:A/C1ViacCOK7EPeeCfiwlUrC2TUtRdEqzrR0Yd9b1KQ=
m7s.live/plugin/edge/v4 v4.0.6 h1:dAxS6cvmWV+pPXCgdu0phoAwH2abjhlKMGfysyxHBNw=
m7s.live/plugin/edge/v4 v4.0.6/go.mod h1:AWeJV1Nu2UWsEdlcCATlQW+bz6Pz/3A11AZG9Z4hIc0=
m7s.live/plugin/fmp4/v4 v4.0.4 h1:DOw7opeMBlei7oyDIzqvkOd5CLKzTv7wT+tyL99dqug=
@@ -424,8 +430,8 @@ m7s.live/plugin/gb28181/v4 v4.4.0 h1:wpVn6yxWat2QullzkTGVcEv1aXwRT+x7iyVowARKB0c
m7s.live/plugin/gb28181/v4 v4.4.0/go.mod h1:6lqP8AwhJOvaoOprdqhX9vbEB4Jg9eD/hT8kXpOJoJQ=
m7s.live/plugin/hdl/v4 v4.1.8 h1:n7o3bu69UCHjzs8ZXHbB+qWo+AVyIY8T8cAocL9kqag=
m7s.live/plugin/hdl/v4 v4.1.8/go.mod h1:Qyga5ZxL83+1uwT+1JBHhTpgepM4nj7XbWF/mMm2P/o=
m7s.live/plugin/hls/v4 v4.3.3 h1:Zdgk9CEQb+8EXqWSz1Qq6WhjMcfa2PB+gkNvXtcDi9I=
m7s.live/plugin/hls/v4 v4.3.3/go.mod h1:ALhv4u5AEBT/QNmf5bAebUm0Kxfa3T6AI04XcaJBm4c=
m7s.live/plugin/hls/v4 v4.3.4-0.20230817113507-51b0e32d8468 h1:5w3aLkl78mCj9TTaSCLhHPQhtH3ODP364WpuFmfYawc=
m7s.live/plugin/hls/v4 v4.3.4-0.20230817113507-51b0e32d8468/go.mod h1:ALhv4u5AEBT/QNmf5bAebUm0Kxfa3T6AI04XcaJBm4c=
m7s.live/plugin/hook/v4 v4.0.2 h1:fKwsx7gDAzfKfCz0C+knoY4wg/qnlQloM996l3jUWNc=
m7s.live/plugin/hook/v4 v4.0.2/go.mod h1:zoyGSwIIdt4NGFdqrKHLFCwwMk4oAOF+dlvSV6cizGU=
m7s.live/plugin/jessica/v4 v4.2.1 h1:GbQ8V2ElHT7Q/0y1cyXCzw/DvTnqkpP1kCOpVd+0d6Y=
@@ -438,12 +444,12 @@ m7s.live/plugin/preview/v4 v4.1.2 h1:ENjeg36xWiPqI2FM0lJzs0t8gyeomEvUFtT5ygu+BrQ
m7s.live/plugin/preview/v4 v4.1.2/go.mod h1:iYhWqFbTvTNDFplbTOrE5X9M6ED7gCKkKMuM5QmBocg=
m7s.live/plugin/ps/v4 v4.1.0 h1:uSoFlPk5ws+YCFH5cfgN56qQCPHjW16M5fsWGFWuXHE=
m7s.live/plugin/ps/v4 v4.1.0/go.mod h1:v59bPt1T+IxuRLRchQ+PwKkLxTRuEY4tbo13lNX6JPc=
m7s.live/plugin/record/v4 v4.4.1 h1:zaZQ63DVHjufrG5agg8kx31tcsUFxHuo+OCRxJGWGJo=
m7s.live/plugin/record/v4 v4.4.1/go.mod h1:vHVl6pLXJImoEeokZyE+1dI+JRXjT9YHmmVwSqkpGM0=
m7s.live/plugin/record/v4 v4.4.2-0.20230818060709-6c289bbcd27f h1:bEj6cfLLF/oYYNHHGASmxw4AU5kvR8RmPoeICxuJScQ=
m7s.live/plugin/record/v4 v4.4.2-0.20230818060709-6c289bbcd27f/go.mod h1:vHVl6pLXJImoEeokZyE+1dI+JRXjT9YHmmVwSqkpGM0=
m7s.live/plugin/room/v4 v4.0.11 h1:a4XOzHmsTrvi3N809IMaFGpimiJUMz8D9+BRnBk44Oc=
m7s.live/plugin/room/v4 v4.0.11/go.mod h1:bGNV2Me/k2KBfbO+fiUdC+HKJBE2wS84HczzSHfrSAI=
m7s.live/plugin/rtmp/v4 v4.2.5 h1:EDjIBD0DZAm8cD76p9wRx0k2iPsxGOF28O6HTyjPBq0=
m7s.live/plugin/rtmp/v4 v4.2.5/go.mod h1:+RzS8WC4AhPEb+CD9T4H+5CoApQCw2X3tNjEaqBVnwk=
m7s.live/plugin/rtmp/v4 v4.2.6-0.20230817113543-91af4e990e99 h1:oGPMxN2dN05pVS5gKvkTAv94vMfUmEgCI4aSUpdz2DI=
m7s.live/plugin/rtmp/v4 v4.2.6-0.20230817113543-91af4e990e99/go.mod h1:+RzS8WC4AhPEb+CD9T4H+5CoApQCw2X3tNjEaqBVnwk=
m7s.live/plugin/rtsp/v4 v4.2.6 h1:B0l7Y6c53B3oAaf5FgOX5P3QiWmBBdTSwZAjqW/086Y=
m7s.live/plugin/rtsp/v4 v4.2.6/go.mod h1:LbtAtisud3EXouOgAIf/dh8gxqzhS/dhEPigGiZFz8g=
m7s.live/plugin/snap/v4 v4.0.7 h1:9otl/K5Iq+wlnrcTEIOnBXGarNXd+Fl4r+684Uz+V+k=