From 0febae3242a1f3233c91c2076eab69bd8f76b3e8 Mon Sep 17 00:00:00 2001 From: Ingo Oppermann Date: Thu, 18 Aug 2022 12:00:37 +0300 Subject: [PATCH] Return number of purged files --- restream/fs/fs.go | 7 +++++-- restream/restream.go | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/restream/fs/fs.go b/restream/fs/fs.go index f4952ebf..4769597f 100644 --- a/restream/fs/fs.go +++ b/restream/fs/fs.go @@ -111,6 +111,7 @@ func (fs *filesystem) SetCleanup(id string, patterns []Pattern) { fs.cleanupPatterns[id] = append(fs.cleanupPatterns[id], patterns...) } + func (fs *filesystem) UnsetCleanup(id string) { fs.logger.Debug().WithField("id", id).Log("Remove pattern group") @@ -118,7 +119,6 @@ func (fs *filesystem) UnsetCleanup(id string) { defer fs.cleanupLock.Unlock() patterns := fs.cleanupPatterns[id] - delete(fs.cleanupPatterns, id) fs.purge(patterns) @@ -155,7 +155,7 @@ func (fs *filesystem) cleanup() { } } -func (fs *filesystem) purge(patterns []Pattern) { +func (fs *filesystem) purge(patterns []Pattern) (nfiles uint64) { for _, pattern := range patterns { if !pattern.PurgeOnDelete { continue @@ -165,8 +165,11 @@ func (fs *filesystem) purge(patterns []Pattern) { for _, f := range files { fs.logger.Debug().WithField("path", f.Name()).Log("Purging file") fs.Filesystem.Delete(f.Name()) + nfiles++ } } + + return } func (fs *filesystem) cleanupTicker(ctx context.Context, interval time.Duration) { diff --git a/restream/restream.go b/restream/restream.go index 3793a787..137e0acb 100644 --- a/restream/restream.go +++ b/restream/restream.go @@ -913,7 +913,6 @@ func (r *restream) deleteProcess(id string) error { } r.unsetPlayoutPorts(task) - r.unsetCleanup(id) delete(r.tasks, id)