From d670e87908da549ff4a50a58b09f6bdd9e55bf1f Mon Sep 17 00:00:00 2001 From: vinchent Date: Thu, 29 Aug 2024 13:48:47 +0200 Subject: [PATCH] Add mongo to docker and test logger --- logger-service/cmd/api/handlers.go | 8 ++++++-- logger-service/cmd/api/main.go | 5 ++++- project/docker-compose.yml | 11 +++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/logger-service/cmd/api/handlers.go b/logger-service/cmd/api/handlers.go index ae85630..2114dda 100644 --- a/logger-service/cmd/api/handlers.go +++ b/logger-service/cmd/api/handlers.go @@ -13,7 +13,11 @@ type JSONPayload struct { func (app *Config) WriteLog(w http.ResponseWriter, r *http.Request) { // read json into var var requestPayload JSONPayload - app.readJSON(w, r, &requestPayload) + err := app.readJSON(w, r, &requestPayload) + if err != nil { + app.errorJSON(w, err) + return + } // insert data event := data.LogEntry{ @@ -21,7 +25,7 @@ func (app *Config) WriteLog(w http.ResponseWriter, r *http.Request) { Data: requestPayload.Data, } - err := app.Models.LogEntry.Insert(event) + err = app.Models.LogEntry.Insert(event) if err != nil { app.errorJSON(w, err) return diff --git a/logger-service/cmd/api/main.go b/logger-service/cmd/api/main.go index fa5fa7e..691abbb 100644 --- a/logger-service/cmd/api/main.go +++ b/logger-service/cmd/api/main.go @@ -47,7 +47,8 @@ func main() { } // start web server - go app.serve() + log.Println("Starting service on port", webPort) + app.serve() } func (app *Config) serve() { @@ -74,5 +75,7 @@ func connectToMongo() (*mongo.Client, error) { return nil, err } + log.Println("Connected to Mongo") + return client, nil } diff --git a/project/docker-compose.yml b/project/docker-compose.yml index 5229a01..899c07c 100644 --- a/project/docker-compose.yml +++ b/project/docker-compose.yml @@ -37,6 +37,17 @@ services: volumes: - ./db-data/postgres:/var/lib/postgresql/data + mongo: + image: mongo + ports: + - "27017:27017" + environment: + MONGO_INITDB_DATABASE: logs + MONGO_INITDB_USERNAME: admin + MONGO_INITDB_PASSWORD: password + volumes: + - ./db-data/mongo:/data/db + adminer: image: adminer restart: always