From 2bb0ded20e6abfed2faf67047b0dd48e318973d3 Mon Sep 17 00:00:00 2001 From: Lakhan Samani Date: Sat, 5 Feb 2022 09:00:56 +0530 Subject: [PATCH] fix: error log and gin mode --- .envtest | 2 ++ server/db/providers/sql/sql.go | 15 +++++++++++++++ server/env/env.go | 5 +++-- server/sessionstore/session.go | 1 - 4 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 .envtest diff --git a/.envtest b/.envtest new file mode 100644 index 0000000..5ec9f35 --- /dev/null +++ b/.envtest @@ -0,0 +1,2 @@ +DATABASE_URL=postgres://localhost:5432/postgres +DATABASE_TYPE=postgres diff --git a/server/db/providers/sql/sql.go b/server/db/providers/sql/sql.go index ccc1c2c..a75408a 100644 --- a/server/db/providers/sql/sql.go +++ b/server/db/providers/sql/sql.go @@ -1,6 +1,10 @@ package sql import ( + "log" + "os" + "time" + "github.com/authorizerdev/authorizer/server/constants" "github.com/authorizerdev/authorizer/server/db/models" "github.com/authorizerdev/authorizer/server/envstore" @@ -9,6 +13,7 @@ import ( "gorm.io/driver/sqlite" "gorm.io/driver/sqlserver" "gorm.io/gorm" + "gorm.io/gorm/logger" "gorm.io/gorm/schema" ) @@ -20,8 +25,18 @@ type provider struct { func NewProvider() (*provider, error) { var sqlDB *gorm.DB var err error + customLogger := logger.New( + log.New(os.Stdout, "\r\n", log.LstdFlags), // io writer + logger.Config{ + SlowThreshold: time.Second, // Slow SQL threshold + LogLevel: logger.Silent, // Log level + IgnoreRecordNotFoundError: true, // Ignore ErrRecordNotFound error for logger + Colorful: false, // Disable color + }, + ) ormConfig := &gorm.Config{ + Logger: customLogger, NamingStrategy: schema.NamingStrategy{ TablePrefix: models.Prefix, }, diff --git a/server/env/env.go b/server/env/env.go index 1548c3a..7e65e9f 100644 --- a/server/env/env.go +++ b/server/env/env.go @@ -8,6 +8,7 @@ import ( "github.com/authorizerdev/authorizer/server/constants" "github.com/authorizerdev/authorizer/server/envstore" "github.com/authorizerdev/authorizer/server/utils" + "github.com/gin-gonic/gin" "github.com/google/uuid" "github.com/joho/godotenv" ) @@ -25,7 +26,7 @@ func InitEnv() { if envData.StringEnv[constants.EnvKeyEnv] == "production" { envData.BoolEnv[constants.EnvKeyIsProd] = true - os.Setenv("GIN_MODE", "release") + gin.SetMode(gin.ReleaseMode) } else { envData.BoolEnv[constants.EnvKeyIsProd] = false } @@ -45,7 +46,7 @@ func InitEnv() { err := godotenv.Load(envData.StringEnv[constants.EnvKeyEnvPath]) if err != nil { - log.Printf("error loading %s file", envData.StringEnv[constants.EnvKeyEnvPath]) + log.Printf("using OS env instead of %s file", envData.StringEnv[constants.EnvKeyEnvPath]) } if envData.StringEnv[constants.EnvKeyPort] == "" { diff --git a/server/sessionstore/session.go b/server/sessionstore/session.go index b473afb..aeaad1d 100644 --- a/server/sessionstore/session.go +++ b/server/sessionstore/session.go @@ -138,7 +138,6 @@ func InitSession() { } } else { - log.Println("using in memory store to save sessions") SessionStoreObj.InMemoryStoreObj = &InMemoryStore{ store: map[string]map[string]string{}, socialLoginState: map[string]string{},