From ae4c6e5cad212bf4b107d25005f30191d5e915ee Mon Sep 17 00:00:00 2001
From: Alex Kaminskii <alex@openreplay.com>
Date: Sat, 7 May 2022 23:52:48 +0200
Subject: [PATCH] refactor(backend-sink): go go standarts

---
 backend/{services => cmd}/sink/main.go        | 18 ++++++++-------
 backend/internal/config/sink/config.go        | 23 +++++++++++++++++++
 .../oswriter/oswriter.go}                     |  2 +-
 backend/services/sink/build_hack              |  0
 4 files changed, 34 insertions(+), 9 deletions(-)
 rename backend/{services => cmd}/sink/main.go (82%)
 create mode 100644 backend/internal/config/sink/config.go
 rename backend/{services/sink/writer.go => internal/oswriter/oswriter.go} (99%)
 create mode 100644 backend/services/sink/build_hack

diff --git a/backend/services/sink/main.go b/backend/cmd/sink/main.go
similarity index 82%
rename from backend/services/sink/main.go
rename to backend/cmd/sink/main.go
index 1a23919c6..fcab40321 100644
--- a/backend/services/sink/main.go
+++ b/backend/cmd/sink/main.go
@@ -9,7 +9,8 @@ import (
 	"os/signal"
 	"syscall"
 
-	"openreplay/backend/pkg/env"
+	"openreplay/backend/internal/config/sink"
+	"openreplay/backend/internal/oswriter"
 	. "openreplay/backend/pkg/messages"
 	"openreplay/backend/pkg/queue"
 	"openreplay/backend/pkg/queue/types"
@@ -18,20 +19,21 @@ import (
 func main() {
 	log.SetFlags(log.LstdFlags | log.LUTC | log.Llongfile)
 
-	FS_DIR := env.String("FS_DIR")
-	if _, err := os.Stat(FS_DIR); os.IsNotExist(err) {
-		log.Fatalf("%v doesn't exist. %v", FS_DIR, err)
+	cfg := sink.New()
+
+	if _, err := os.Stat(cfg.FsDir); os.IsNotExist(err) {
+		log.Fatalf("%v doesn't exist. %v", cfg.FsDir, err)
 	}
 
-	writer := NewWriter(env.Uint16("FS_ULIMIT"), FS_DIR)
+	writer := oswriter.NewWriter(cfg.FsUlimit, cfg.FsDir)
 
 	count := 0
 
 	consumer := queue.NewMessageConsumer(
-		env.String("GROUP_SINK"),
+		cfg.GroupSink,
 		[]string{
-			env.String("TOPIC_RAW_WEB"),
-			env.String("TOPIC_RAW_IOS"),
+			cfg.TopicRawIOS,
+			cfg.TopicRawWeb,
 		},
 		func(sessionID uint64, message Message, _ *types.Meta) {
 			typeID := message.TypeID()
diff --git a/backend/internal/config/sink/config.go b/backend/internal/config/sink/config.go
new file mode 100644
index 000000000..4837e86e3
--- /dev/null
+++ b/backend/internal/config/sink/config.go
@@ -0,0 +1,23 @@
+package sink
+
+import (
+	"openreplay/backend/pkg/env"
+)
+
+type Config struct {
+	FsDir       string
+	FsUlimit    uint16
+	GroupSink   string
+	TopicRawWeb string
+	TopicRawIOS string
+}
+
+func New() *Config {
+	return &Config{
+		FsDir:       env.String("FS_DIR"),
+		FsUlimit:    env.Uint16("FS_ULIMIT"),
+		GroupSink:   env.String("GROUP_SINK"),
+		TopicRawWeb: env.String("TOPIC_RAW_WEB"),
+		TopicRawIOS: env.String("TOPIC_RAW_IOS"),
+	}
+}
diff --git a/backend/services/sink/writer.go b/backend/internal/oswriter/oswriter.go
similarity index 99%
rename from backend/services/sink/writer.go
rename to backend/internal/oswriter/oswriter.go
index 6fcfdddbc..839e61eba 100644
--- a/backend/services/sink/writer.go
+++ b/backend/internal/oswriter/oswriter.go
@@ -1,4 +1,4 @@
-package main
+package oswriter
 
 import (
 	"math"
diff --git a/backend/services/sink/build_hack b/backend/services/sink/build_hack
new file mode 100644
index 000000000..e69de29bb