From e333a56ca08064a48d9d5aaa4a18f4d69ccdaf90 Mon Sep 17 00:00:00 2001 From: Lee Brown Date: Thu, 29 Aug 2019 01:07:49 -0800 Subject: [PATCH] fix webapp masterdb --- cmd/web-api/sample.env | 1 + cmd/web-app/main.go | 6 +++--- cmd/web-app/sample.env | 1 + internal/mid/errors.go | 2 -- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/web-api/sample.env b/cmd/web-api/sample.env index b7e0571..205cb3f 100644 --- a/cmd/web-api/sample.env +++ b/cmd/web-api/sample.env @@ -2,4 +2,5 @@ export WEB_API_DB_HOST=127.0.0.1:5433 export WEB_API_DB_USER=postgres export WEB_API_DB_PASS=postgres export WEB_API_DB_DISABLE_TLS=true +export WEB_API_REDIS_HOST=:6378 export WEB_API_SERVICE_EMAIL_SENDER=valdez@example.com diff --git a/cmd/web-app/main.go b/cmd/web-app/main.go index 84fc4a8..f8f702c 100644 --- a/cmd/web-app/main.go +++ b/cmd/web-app/main.go @@ -452,9 +452,9 @@ func main() { prjRepo := project.NewRepository(masterDb) appCtx := &handlers.AppContext{ - Log: log, - Env: cfg.Env, - //MasterDB: masterDb, + Log: log, + Env: cfg.Env, + MasterDB: masterDb, Redis: redisClient, TemplateDir: cfg.Service.TemplateDir, StaticDir: cfg.Service.StaticFiles.Dir, diff --git a/cmd/web-app/sample.env b/cmd/web-app/sample.env index cb9bedc..08e5604 100644 --- a/cmd/web-app/sample.env +++ b/cmd/web-app/sample.env @@ -2,4 +2,5 @@ export WEB_APP_DB_HOST=127.0.0.1:5433 export WEB_APP_DB_USER=postgres export WEB_APP_DB_PASS=postgres export WEB_APP_DB_DISABLE_TLS=true +export WEB_APP_REDIS_HOST=:6378 export WEB_APP_SERVICE_EMAIL_SENDER=valdez@example.com \ No newline at end of file diff --git a/internal/mid/errors.go b/internal/mid/errors.go index ce6c670..32778d0 100644 --- a/internal/mid/errors.go +++ b/internal/mid/errors.go @@ -33,8 +33,6 @@ func Errors(log *log.Logger, renderer web.Renderer) web.Middleware { log.Printf("ERROR : %+v", er) } - - // Respond to the error. if web.RequestIsJson(r) { if err := web.RespondJsonError(ctx, w, er); err != nil {