Skip to content

Take control over your live stream video by running it yourself. Streaming + chat out of the box.

Adjust CleanupDirectory function to support tmpfs mounts. (#3818)

Logan Fick22c2f583f4f7
diff --git a/utils/utils.go b/utils/utils.go
index 64d9566f92..3e266ae3a7 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -302,14 +302,21 @@ func VerifyFFMpegPath(path string) error {
return nil
}
-// CleanupDirectory removes the directory and makes it fresh again. Throws fatal error on failure.
+// CleanupDirectory removes all contents within the directory, or creates it if it does not exist. Throws fatal error on failure.
func CleanupDirectory(path string) {
log.Traceln("Cleaning", path)
- if err := os.RemoveAll(path); err != nil {
- log.Fatalln("Unable to remove directory. Please check the ownership and permissions", err)
- }
if err := os.MkdirAll(path, 0o750); err != nil {
- log.Fatalln("Unable to create directory. Please check the ownership and permissions", err)
+ log.Fatalf("Unable to create '%s'. Please check the ownership and permissions: %s\n", path, err)
+ }
+ entries, err := os.ReadDir(path)
+ if err != nil {
+ log.Fatalf("Unable to read contents of '%s'. Please check the ownership and permissions: %s\n", path, err)
+ }
+ for _, entry := range entries {
+ entryPath := filepath.Join(path, entry.Name())
+ if err := os.RemoveAll(entryPath); err != nil {
+ log.Fatalf("Unable to remove file or directory contained in '%s'. Please check the ownership and permissions: %s\n", path, err)
+ }
}
}