From d08e1d8473362a3fcd0cc279d9e82b188e9c1010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Baldeweg?= <56736413+abaldeweg@users.noreply.github.com> Date: Thu, 30 Jan 2025 22:53:16 +0000 Subject: [PATCH] Update README and refactor MongoDB connection to use configurable URI --- README.md | 6 +++++- logs_import/db/db.go | 3 ++- logs_import/main.go | 6 ++++++ logs_web/db/db.go | 5 +++-- logs_web/main.go | 6 ++++++ 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8b1f770..8c084f5 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,11 @@ Mount data volume to `/usr/src/app/data/`. The module processes logs and returns them by request. -Mount data volumes to `/usr/src/app/data/auth/`, `/usr/src/app/data/db/` and `/usr/src/app/data/source/`. +Mount data volumes to `/usr/src/app/data/auth/` and `/usr/src/app/data/source/`. + +|Var |Description +|-----------------------|----------- +|MONGODB_URI |MongoDB connection string ## Release diff --git a/logs_import/db/db.go b/logs_import/db/db.go index 6184ad4..e0e0c7c 100644 --- a/logs_import/db/db.go +++ b/logs_import/db/db.go @@ -5,6 +5,7 @@ import ( "encoding/json" "github.com/abaldeweg/warehouse-server/logs_import/entity" + "github.com/spf13/viper" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" @@ -18,7 +19,7 @@ type DBHandler struct { // NewDBHandler creates a new DBHandler. func NewDBHandler() (*DBHandler, error) { - clientOptions := options.Client().ApplyURI("mongodb://localhost:27017") + clientOptions := options.Client().ApplyURI(viper.Get("MONGODB_URI").(string)) client, err := mongo.Connect(context.TODO(), clientOptions) if err != nil { return nil, err diff --git a/logs_import/main.go b/logs_import/main.go index 6e27aaf..c4d02d4 100644 --- a/logs_import/main.go +++ b/logs_import/main.go @@ -3,10 +3,16 @@ package main import ( "time" + "github.com/abaldeweg/warehouse-server/framework/config" "github.com/abaldeweg/warehouse-server/logs_import/cmd" + "github.com/spf13/viper" ) func main() { + config.LoadAppConfig() + + viper.SetDefault("MONGODB_URI", "mongodb://localhost:27017") + go cmd.Execute() for { diff --git a/logs_web/db/db.go b/logs_web/db/db.go index a7a918a..a12549f 100644 --- a/logs_web/db/db.go +++ b/logs_web/db/db.go @@ -6,6 +6,7 @@ import ( "time" "github.com/abaldeweg/warehouse-server/logs_web/entity" + "github.com/spf13/viper" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" @@ -13,13 +14,13 @@ import ( // DBHandler handles database operations for logs. type DBHandler struct { - client *mongo.Client + client *mongo.Client collection *mongo.Collection } // NewDBHandler creates a new DBHandler. func NewDBHandler() (*DBHandler, error) { - clientOptions := options.Client().ApplyURI("mongodb://localhost:27017") + clientOptions := options.Client().ApplyURI(viper.Get("MONGODB_URI").(string)) client, err := mongo.Connect(context.TODO(), clientOptions) if err != nil { return nil, err diff --git a/logs_web/main.go b/logs_web/main.go index 372558f..57d964d 100644 --- a/logs_web/main.go +++ b/logs_web/main.go @@ -3,10 +3,16 @@ package main import ( "log" + "github.com/abaldeweg/warehouse-server/framework/config" "github.com/abaldeweg/warehouse-server/logs_web/router" + "github.com/spf13/viper" ) func main() { + config.LoadAppConfig() + + viper.SetDefault("MONGODB_URI", "mongodb://localhost:27017") + r := router.Routes() log.Fatal(r.Run(":8080")) }