fix debug files (#712)

livekit · Jun 27, 2024 · 14aad09 · 14aad09
1 parent 9392737
commit 14aad09
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/pkg/pipeline/debug.go b/pkg/pipeline/debug.go
@@ -81,22 +81,19 @@ func (c *Controller) uploadDebugFiles() {
 }
 
 func (c *Controller) uploadTrackFiles(u uploader.Uploader) {
-	var dir string
 	if c.Debug.ToUploadConfig() == nil {
-		dir = c.Debug.PathPrefix
-	} else {
-		dir = c.TmpDir
+		return
 	}
 
-	files, err := os.ReadDir(dir)
+	files, err := os.ReadDir(c.TmpDir)
 	if err != nil {
 		return
 	}
 
 	for _, f := range files {
 		if strings.HasSuffix(f.Name(), ".csv") {
-			local := path.Join(dir, f.Name())
-			storage := path.Join(c.Debug.PathPrefix, f.Name())
+			local := path.Join(c.TmpDir, f.Name())
+			storage := path.Join(c.Debug.PathPrefix, c.Info.EgressId, f.Name())
 			_, _, err = u.Upload(local, storage, types.OutputTypeBlob, false, "track")
 			if err != nil {
 				logger.Errorw("failed to upload debug file", err)
@@ -121,17 +118,16 @@ func (c *Controller) uploadPProf(u uploader.Uploader) {
 }
 
 func (c *Controller) uploadDebugFile(u uploader.Uploader, data []byte, fileExtension string) {
+	storageDir := path.Join(c.Debug.PathPrefix, c.Info.EgressId)
 	var dir string
 	if c.Debug.ToUploadConfig() == nil {
-		dir = c.Debug.PathPrefix
+		dir = storageDir
 	} else {
 		dir = c.TmpDir
 	}
 
 	filename := fmt.Sprintf("%s%s", c.Info.EgressId, fileExtension)
 	local := path.Join(dir, filename)
-	storage := path.Join(c.Debug.PathPrefix, c.Info.EgressId, filename)
-
 	f, err := os.Create(local)
 	if err != nil {
 		logger.Errorw("failed to create debug file", err)
@@ -145,7 +141,11 @@ func (c *Controller) uploadDebugFile(u uploader.Uploader, data []byte, fileExten
 		return
 	}
 
-	_, _, err = u.Upload(local, storage, types.OutputTypeBlob, false, "debug")
+	if c.Debug.ToUploadConfig() == nil {
+		return
+	}
+
+	_, _, err = u.Upload(local, path.Join(storageDir, filename), types.OutputTypeBlob, false, "debug")
 	if err != nil {
 		logger.Errorw("failed to upload debug file", err)
 		return

diff --git a/pkg/pipeline/source/sdk.go b/pkg/pipeline/source/sdk.go
@@ -17,6 +17,7 @@ package source
 import (
 	"context"
 	"fmt"
+	"os"
 	"path"
 	"strings"
 	"sync"
@@ -489,9 +490,12 @@ func (s *SDKSource) createWriter(
 	var logFilename string
 	if s.Debug.EnableProfiling {
 		if s.Debug.ToUploadConfig() == nil {
-			logFilename = path.Join(s.Debug.PathPrefix, fmt.Sprintf("%s/%s.csv", s.Info.EgressId, track.ID()))
+			if err := os.MkdirAll(path.Join(s.Debug.PathPrefix, s.Info.EgressId), 0755); err != nil {
+				return nil, err
+			}
+			logFilename = path.Join(s.Debug.PathPrefix, s.Info.EgressId, fmt.Sprintf("%s.csv", track.ID()))
 		} else {
-			logFilename = path.Join(s.TmpDir, fmt.Sprintf("%s/%s.csv", s.Info.EgressId, track.ID()))
+			logFilename = path.Join(s.TmpDir, fmt.Sprintf("%s.csv", track.ID()))
 		}
 	}