mirror of
https://github.com/datarhei/core.git
synced 2025-10-06 00:17:07 +08:00
Add config value for how many minimal process report should be kept in the history
A minimal history is a history entry without log and prelude. The corresponding config entry is ffmpeg.log.max_minimal_history. This value is added on top of the ffmpeg.log.max_history value. I.e. the latest max_history entries contain the log and prelude, and the remaining entries don't have the log and prelude. In total there are max_minimal_history+max_history history entries. If you want no history, set both values to 0. If you want only full history, set max_minimal_history to 0. If you want only minimal history, set max_history to 0.
This commit is contained in:
@@ -44,14 +44,15 @@ type ProcessConfig struct {
|
||||
// Config is the configuration for ffmpeg that is part of the configuration
|
||||
// for the restreamer instance.
|
||||
type Config struct {
|
||||
Binary string
|
||||
MaxProc int64
|
||||
MaxLogLines int
|
||||
LogHistoryLength int
|
||||
ValidatorInput Validator
|
||||
ValidatorOutput Validator
|
||||
Portrange net.Portranger
|
||||
Collector session.Collector
|
||||
Binary string
|
||||
MaxProc int64
|
||||
MaxLogLines int
|
||||
LogHistoryLength int
|
||||
LogMinimalHistoryLength int
|
||||
ValidatorInput Validator
|
||||
ValidatorOutput Validator
|
||||
Portrange net.Portranger
|
||||
Collector session.Collector
|
||||
}
|
||||
|
||||
type ffmpeg struct {
|
||||
@@ -61,8 +62,9 @@ type ffmpeg struct {
|
||||
portrange net.Portranger
|
||||
skills skills.Skills
|
||||
|
||||
logLines int
|
||||
historyLength int
|
||||
logLines int
|
||||
historyLength int
|
||||
minimalHistoryLength int
|
||||
|
||||
collector session.Collector
|
||||
|
||||
@@ -80,6 +82,7 @@ func New(config Config) (FFmpeg, error) {
|
||||
|
||||
f.binary = binary
|
||||
f.historyLength = config.LogHistoryLength
|
||||
f.minimalHistoryLength = config.LogMinimalHistoryLength
|
||||
f.logLines = config.MaxLogLines
|
||||
|
||||
f.portrange = config.Portrange
|
||||
@@ -153,10 +156,11 @@ func (f *ffmpeg) New(config ProcessConfig) (process.Process, error) {
|
||||
|
||||
func (f *ffmpeg) NewProcessParser(logger log.Logger, id, reference string) parse.Parser {
|
||||
p := parse.New(parse.Config{
|
||||
LogHistory: f.historyLength,
|
||||
LogLines: f.logLines,
|
||||
Logger: logger,
|
||||
Collector: NewWrappedCollector(id, reference, f.collector),
|
||||
LogLines: f.logLines,
|
||||
LogHistory: f.historyLength,
|
||||
LogMinimalHistory: f.minimalHistoryLength,
|
||||
Logger: logger,
|
||||
Collector: NewWrappedCollector(id, reference, f.collector),
|
||||
})
|
||||
|
||||
return p
|
||||
|
Reference in New Issue
Block a user