From 29e7a51f8c5eab32ca86b30c09db11d6c3f9cd99 Mon Sep 17 00:00:00 2001 From: Sergey Petrov Date: Thu, 27 Mar 2025 11:08:36 +0500 Subject: [PATCH] Refactoring. --- writer/cmd/main.go | 2 +- writer/internal/ingest/rtsp/rtsp.go | 2 +- writer/pkg/storage/file_manager.go | 7 +------ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/writer/cmd/main.go b/writer/cmd/main.go index 71d6624..ecdc2a2 100644 --- a/writer/cmd/main.go +++ b/writer/cmd/main.go @@ -13,7 +13,7 @@ import ( func main() { config.LogsDirectory = log2.DirCreator(config.Local, "logs") logger.Log = log2.MainLogging( - fmt.Sprintf("%s/Main_%s.log", config.LogsDirectory, time.Now().Format("15-04-05_02-01-2006"))) + fmt.Sprintf("%s/writer-main_%s.log", config.LogsDirectory, time.Now().Format("15-04-05_02-01-2006"))) rtsp.StartWriter() select {} diff --git a/writer/internal/ingest/rtsp/rtsp.go b/writer/internal/ingest/rtsp/rtsp.go index 3c3fdeb..3a1180e 100644 --- a/writer/internal/ingest/rtsp/rtsp.go +++ b/writer/internal/ingest/rtsp/rtsp.go @@ -53,7 +53,7 @@ func rtsp(dir string, period int, link string, number int) error { // Create logger. cutURI := LastPartURI(link) - cam := log2.CamLogging(fmt.Sprintf("%s/%s/Cam_%s.log", dirData, cutURI, time.Now().Format("15-04-05_02-01-2006"))) + cam := log2.CamLogging(fmt.Sprintf("%s/%s/writer-cam_%s.log", dirData, cutURI, time.Now().Format("15-04-05_02-01-2006"))) // Connect to the server. c := gortsplib.Client{ diff --git a/writer/pkg/storage/file_manager.go b/writer/pkg/storage/file_manager.go index 831c59b..03945a7 100644 --- a/writer/pkg/storage/file_manager.go +++ b/writer/pkg/storage/file_manager.go @@ -21,12 +21,7 @@ func CreateFileName(dirData string, resolutions []string, cutURI string, period // ReadDir reads directory and returns the slice of files in th directory. func ReadDir(dirData string) ([]os.DirEntry, error) { - homeDir, err := os.UserHomeDir() - if err != nil { - return nil, err - } - - files, err := os.ReadDir(homeDir + dirData) + files, err := os.ReadDir(dirData) if err != nil { return nil, err }