zgaetano/datarhei-dragonfork-core
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 4 Packages Wiki Activity Actions

Fix assigning cleanup rules for diskfs

Browse source
This commit is contained in:
Ingo Oppermann 2022-08-26 08:17:17 +03:00
parent 6ee565b3c9
commit f1141d1ad9
No known key found for this signature in database
GPG key ID: 2AB32426E9DD229E
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
restream/restream.go
View file

@ -128,7 +128,7 @@ func New(config Config) (Restreamer, error) {
if config.DiskFS != nil { if config.DiskFS != nil {
r.fs.diskfs = rfs.New(rfs.Config{ r.fs.diskfs = rfs.New(rfs.Config{
FS: config.DiskFS, FS: config.DiskFS,
Logger: r.logger.WithComponent("DiskFS"), Logger: r.logger.WithComponent("Cleanup").WithField("type", "diskfs"),
}) })
} else { } else {
r.fs.diskfs = rfs.New(rfs.Config{ r.fs.diskfs = rfs.New(rfs.Config{
@ -139,7 +139,7 @@ func New(config Config) (Restreamer, error) {
if config.MemFS != nil { if config.MemFS != nil {
r.fs.memfs = rfs.New(rfs.Config{ r.fs.memfs = rfs.New(rfs.Config{
FS: config.MemFS, FS: config.MemFS,
Logger: r.logger.WithComponent("MemFS"), Logger: r.logger.WithComponent("Cleanup").WithField("type", "memfs"),
}) })
} else { } else {
r.fs.memfs = rfs.New(rfs.Config{ r.fs.memfs = rfs.New(rfs.Config{
@ -478,7 +478,7 @@ func (r *restream) setCleanup(id string, config *app.Config) {
}, },
}) })
} else if strings.HasPrefix(c.Pattern, "diskfs:") { } else if strings.HasPrefix(c.Pattern, "diskfs:") {
r.fs.memfs.SetCleanup(id, []rfs.Pattern{ r.fs.diskfs.SetCleanup(id, []rfs.Pattern{
{ {
Pattern: strings.TrimPrefix(c.Pattern, "diskfs:"), Pattern: strings.TrimPrefix(c.Pattern, "diskfs:"),
MaxFiles: c.MaxFiles, MaxFiles: c.MaxFiles,