apps/core
1
0
Fork 0
mirror of https://github.com/datarhei/core.git synced 2025-09-27 04:16:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Return number of purged files

Browse Source
This commit is contained in:
Ingo Oppermann
2022-08-18 12:00:37 +03:00
parent 6802830c62
commit 0febae3242
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
restream/fs/fs.go
View File

@@ -111,6 +111,7 @@ func (fs *filesystem) SetCleanup(id string, patterns []Pattern) {
fs.cleanupPatterns[id] = append(fs.cleanupPatterns[id], patterns...) fs.cleanupPatterns[id] = append(fs.cleanupPatterns[id], patterns...)
} }
func (fs *filesystem) UnsetCleanup(id string) { func (fs *filesystem) UnsetCleanup(id string) {
fs.logger.Debug().WithField("id", id).Log("Remove pattern group") fs.logger.Debug().WithField("id", id).Log("Remove pattern group")
@@ -118,7 +119,6 @@ func (fs *filesystem) UnsetCleanup(id string) {
defer fs.cleanupLock.Unlock() defer fs.cleanupLock.Unlock()
patterns := fs.cleanupPatterns[id] patterns := fs.cleanupPatterns[id]
delete(fs.cleanupPatterns, id) delete(fs.cleanupPatterns, id)
fs.purge(patterns) 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 { for _, pattern := range patterns {
if !pattern.PurgeOnDelete { if !pattern.PurgeOnDelete {
continue continue
@@ -165,8 +165,11 @@ func (fs *filesystem) purge(patterns []Pattern) {
for _, f := range files { for _, f := range files {
fs.logger.Debug().WithField("path", f.Name()).Log("Purging file") fs.logger.Debug().WithField("path", f.Name()).Log("Purging file")
fs.Filesystem.Delete(f.Name()) fs.Filesystem.Delete(f.Name())
nfiles++
} }
} }
return
} }
func (fs *filesystem) cleanupTicker(ctx context.Context, interval time.Duration) { func (fs *filesystem) cleanupTicker(ctx context.Context, interval time.Duration) {

1
restream/restream.go
View File

@@ -913,7 +913,6 @@ func (r *restream) deleteProcess(id string) error {
} }
r.unsetPlayoutPorts(task) r.unsetPlayoutPorts(task)
r.unsetCleanup(id) r.unsetCleanup(id)
delete(r.tasks, id) delete(r.tasks, id)