Merge branch 'main' of https://github.com/abaldeweg/warehouse-server

abaldeweg · Jan 24, 2025 · b796680 · b796680
2 parents 3964d5a + d0d2d06
commit b796680
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/logs_import/go.mod b/logs_import/go.mod
@@ -3,7 +3,7 @@ module github.com/abaldeweg/warehouse-server/logs_import
 go 1.23.2
 
 require (
-	github.com/abaldeweg/warehouse-server/logs v0.0.0-20250119131103-647062374439
+	github.com/abaldeweg/warehouse-server/logs v0.0.0-20250123210645-5b2f44e75378
 	github.com/spf13/cobra v1.8.1
 )
 

diff --git a/logs_import/go.sum b/logs_import/go.sum
@@ -1,5 +1,11 @@
 github.com/abaldeweg/warehouse-server/logs v0.0.0-20250119131103-647062374439 h1:YGxAHFomBY60acQhx7pianbf+x/X2Th4VaVEPalkSBg=
 github.com/abaldeweg/warehouse-server/logs v0.0.0-20250119131103-647062374439/go.mod h1:diyGnhJGBE/6aiKAeSTqXF8pqlYCgzBJ/Pun8OPqx9g=
+github.com/abaldeweg/warehouse-server/logs v0.0.0-20250123164018-3580927a4a21 h1:mI9drSf3eEZ+9pD5OQAPkvFlrhvdOfS5+/D/Dlm4Qfg=
+github.com/abaldeweg/warehouse-server/logs v0.0.0-20250123164018-3580927a4a21/go.mod h1:2uw8MX5qdiQauGUtx4TmR3ZK06fykF7rRVKLqi2LxSY=
+github.com/abaldeweg/warehouse-server/logs v0.0.0-20250123191826-b761c4e66785 h1:+idb2zQwGZlogHcm7WQaxI5rTjORYXQDqTONOTqO7kY=
+github.com/abaldeweg/warehouse-server/logs v0.0.0-20250123191826-b761c4e66785/go.mod h1:2uw8MX5qdiQauGUtx4TmR3ZK06fykF7rRVKLqi2LxSY=
+github.com/abaldeweg/warehouse-server/logs v0.0.0-20250123210645-5b2f44e75378 h1:9bOHMpy9ady6qhFROEnz9hqMnbDsnfuqzC8mVArpW6o=
+github.com/abaldeweg/warehouse-server/logs v0.0.0-20250123210645-5b2f44e75378/go.mod h1:2uw8MX5qdiQauGUtx4TmR3ZK06fykF7rRVKLqi2LxSY=
 github.com/bytedance/sonic v1.12.6 h1:/isNmCUF2x3Sh8RAp/4mh4ZGkcFAX/hLrzrK3AvpRzk=
 github.com/bytedance/sonic v1.12.6/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
 github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=

diff --git a/logs_import/main.go b/logs_import/main.go
@@ -1,9 +1,14 @@
 package main
 
 import (
-	"github.com/abaldeweg/warehouse-server/logs_import/cmd"
+    "github.com/abaldeweg/warehouse-server/logs_import/cmd"
+    "time"
 )
 
 func main() {
-  cmd.Execute()
+    go cmd.Execute()
+
+    for {
+        time.Sleep(1 * time.Second)
+    }
 }
diff --git a/logs_web/go.mod b/logs_web/go.mod
@@ -18,7 +18,7 @@ require (
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.3 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.3 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.3 // indirect
-	github.com/abaldeweg/warehouse-server/logs v0.0.0-20250123164018-3580927a4a21
+	github.com/abaldeweg/warehouse-server/logs v0.0.0-20250123210645-5b2f44e75378
 	github.com/bytedance/sonic v1.12.6 // indirect
 	github.com/bytedance/sonic/loader v0.2.1 // indirect
 	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
@@ -31,7 +31,7 @@ require (
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.7 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/gin-gonic/gin v1.10.0 // indirect
+	github.com/gin-gonic/gin v1.10.0
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect

diff --git a/logs_web/go.sum b/logs_web/go.sum
@@ -26,6 +26,10 @@ github.com/abaldeweg/warehouse-server/framework v0.12.1 h1:ZSEmuE3ZCn445Bm5GPR2/
 github.com/abaldeweg/warehouse-server/framework v0.12.1/go.mod h1:w2RfHjLEoMmmwxW8Hn3XcOdZ0dqEy8HIhih8TrRVjpY=
 github.com/abaldeweg/warehouse-server/logs v0.0.0-20250123164018-3580927a4a21 h1:mI9drSf3eEZ+9pD5OQAPkvFlrhvdOfS5+/D/Dlm4Qfg=
 github.com/abaldeweg/warehouse-server/logs v0.0.0-20250123164018-3580927a4a21/go.mod h1:2uw8MX5qdiQauGUtx4TmR3ZK06fykF7rRVKLqi2LxSY=
+github.com/abaldeweg/warehouse-server/logs v0.0.0-20250123191826-b761c4e66785 h1:+idb2zQwGZlogHcm7WQaxI5rTjORYXQDqTONOTqO7kY=
+github.com/abaldeweg/warehouse-server/logs v0.0.0-20250123191826-b761c4e66785/go.mod h1:2uw8MX5qdiQauGUtx4TmR3ZK06fykF7rRVKLqi2LxSY=
+github.com/abaldeweg/warehouse-server/logs v0.0.0-20250123210645-5b2f44e75378 h1:9bOHMpy9ady6qhFROEnz9hqMnbDsnfuqzC8mVArpW6o=
+github.com/abaldeweg/warehouse-server/logs v0.0.0-20250123210645-5b2f44e75378/go.mod h1:2uw8MX5qdiQauGUtx4TmR3ZK06fykF7rRVKLqi2LxSY=
 github.com/bytedance/sonic v1.12.6 h1:/isNmCUF2x3Sh8RAp/4mh4ZGkcFAX/hLrzrK3AvpRzk=
 github.com/bytedance/sonic v1.12.6/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
 github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=