From 7c58ece93620d3a9a2dd37009391e0247293154f Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 28 Feb 2024 13:21:19 +0100 Subject: [PATCH] feat(backend): added separate config for canvas-handler --- backend/cmd/canvas-handler/main.go | 2 +- backend/internal/canvas-handler/service.go | 2 +- .../internal/config/canvas-handler/config.go | 22 +++++++++++++++++++ .../internal/config/imagestorage/config.go | 14 +++++------- 4 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 backend/internal/config/canvas-handler/config.go diff --git a/backend/cmd/canvas-handler/main.go b/backend/cmd/canvas-handler/main.go index 5d5e59bd5..b85df10b5 100644 --- a/backend/cmd/canvas-handler/main.go +++ b/backend/cmd/canvas-handler/main.go @@ -9,7 +9,7 @@ import ( "time" "openreplay/backend/internal/canvas-handler" - config "openreplay/backend/internal/config/imagestorage" + config "openreplay/backend/internal/config/canvas-handler" "openreplay/backend/pkg/messages" "openreplay/backend/pkg/metrics" storageMetrics "openreplay/backend/pkg/metrics/imagestorage" diff --git a/backend/internal/canvas-handler/service.go b/backend/internal/canvas-handler/service.go index 982719856..8c4e70eac 100644 --- a/backend/internal/canvas-handler/service.go +++ b/backend/internal/canvas-handler/service.go @@ -12,7 +12,7 @@ import ( "strconv" "strings" - config "openreplay/backend/internal/config/imagestorage" + config "openreplay/backend/internal/config/canvas-handler" ) type saveTask struct { diff --git a/backend/internal/config/canvas-handler/config.go b/backend/internal/config/canvas-handler/config.go new file mode 100644 index 000000000..e4e04049b --- /dev/null +++ b/backend/internal/config/canvas-handler/config.go @@ -0,0 +1,22 @@ +package canvas_handler + +import ( + "openreplay/backend/internal/config/common" + "openreplay/backend/internal/config/configurator" +) + +type Config struct { + common.Config + FSDir string `env:"FS_DIR,required"` + CanvasDir string `env:"CANVAS_DIR,default=canvas"` + TopicCanvasImages string `env:"TOPIC_CANVAS_IMAGES,required"` + TopicCanvasTrigger string `env:"TOPIC_CANVAS_TRIGGER,required"` + GroupCanvasImage string `env:"GROUP_CANVAS_IMAGE,required"` + UseProfiler bool `env:"PROFILER_ENABLED,default=false"` +} + +func New() *Config { + cfg := &Config{} + configurator.Process(cfg) + return cfg +} diff --git a/backend/internal/config/imagestorage/config.go b/backend/internal/config/imagestorage/config.go index 90cdc6332..17480fdeb 100644 --- a/backend/internal/config/imagestorage/config.go +++ b/backend/internal/config/imagestorage/config.go @@ -9,15 +9,11 @@ import ( type Config struct { common.Config objectstorage.ObjectsConfig - FSDir string `env:"FS_DIR,required"` - ScreenshotsDir string `env:"SCREENSHOTS_DIR,default=screenshots"` - CanvasDir string `env:"CANVAS_DIR,default=canvas"` - TopicRawImages string `env:"TOPIC_RAW_IMAGES,required"` - TopicCanvasImages string `env:"TOPIC_CANVAS_IMAGES,required"` - TopicCanvasTrigger string `env:"TOPIC_CANVAS_TRIGGER,required"` - GroupImageStorage string `env:"GROUP_IMAGE_STORAGE,required"` - GroupCanvasImage string `env:"GROUP_CANVAS_IMAGE,required"` - UseProfiler bool `env:"PROFILER_ENABLED,default=false"` + FSDir string `env:"FS_DIR,required"` + ScreenshotsDir string `env:"SCREENSHOTS_DIR,default=screenshots"` + TopicRawImages string `env:"TOPIC_RAW_IMAGES,required"` + GroupImageStorage string `env:"GROUP_IMAGE_STORAGE,required"` + UseProfiler bool `env:"PROFILER_ENABLED,default=false"` } func New() *Config {