From c74e2e1e8576e8dc18840ab1ff4fe74ad834e650 Mon Sep 17 00:00:00 2001 From: mlabusch Date: Fri, 31 Mar 2017 10:57:01 +0200 Subject: [PATCH] Martin's changes --- .gitignore | 1 + config_example.conf | 1 + http/review.go | 2 +- lib/database/main.go | 3 +++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ab4d2d5..ac492e9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ cmd/review/config.conf +.idea/ diff --git a/config_example.conf b/config_example.conf index ea14d94..9519e5e 100644 --- a/config_example.conf +++ b/config_example.conf @@ -2,6 +2,7 @@ webserver_bind = ":8080" [database] type = "sqlite3" +# logging = true connection = "file::memory:?mode=memory&cache=shared" # For Master-Slave cluster # read_connection = "" diff --git a/http/review.go b/http/review.go index ce1fbee..806b865 100644 --- a/http/review.go +++ b/http/review.go @@ -20,7 +20,7 @@ func listReview(w http.ResponseWriter, r *http.Request) { http.Error(w, "wrong productid", http.StatusNotAcceptable) return } - log.WithField("productid", id) + log = log.WithField("productid", id) var list []*models.Review result := database.Read.Where("product_id = ?", id).Find(&list) if result.RowsAffected == 0 { diff --git a/lib/database/main.go b/lib/database/main.go index e863f93..9309078 100644 --- a/lib/database/main.go +++ b/lib/database/main.go @@ -17,12 +17,14 @@ type Config struct { Type string Connection string ReadConnection string + Logging bool } func Open(c Config) (err error) { config = &c Write, err = gorm.Open(config.Type, config.Connection) Write.SingularTable(true) + Write.LogMode(c.Logging) Write.Callback().Create().Remove("gorm:update_time_stamp") Write.Callback().Update().Remove("gorm:update_time_stamp") if err != nil { @@ -31,6 +33,7 @@ func Open(c Config) (err error) { if len(config.ReadConnection) > 0 { Read, err = gorm.Open(config.Type, config.ReadConnection) Read.SingularTable(true) + Read.LogMode(c.Logging) Read.Callback().Create().Remove("gorm:update_time_stamp") Read.Callback().Update().Remove("gorm:update_time_stamp") } else {