rename prestconf enablecache to pgcache

this variable is used to cache sql queries, not query results Signed-off-by: Avelino <avelinorun@gmail.com>
prest · Dec 23, 2021 · d855ece · d855ece
1 parent afe18fa
commit d855ece
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/adapters/postgres/postgres.go b/adapters/postgres/postgres.go
@@ -57,7 +57,7 @@ type Stmt struct {
 
 // Prepare statement
 func (s *Stmt) Prepare(db *sqlx.DB, tx *sql.Tx, SQL string) (statement *sql.Stmt, err error) {
-	if config.PrestConf.EnableCache && (tx == nil) {
+	if config.PrestConf.PGCache && (tx == nil) {
 		var exists bool
 		s.Mtx.Lock()
 		statement, exists = s.PrepareMap[SQL]
@@ -76,7 +76,7 @@ func (s *Stmt) Prepare(db *sqlx.DB, tx *sql.Tx, SQL string) (statement *sql.Stmt
 	if err != nil {
 		return
 	}
-	if config.PrestConf.EnableCache && (tx == nil) {
+	if config.PrestConf.PGCache && (tx == nil) {
 		s.Mtx.Lock()
 		s.PrepareMap[SQL] = statement
 		s.Mtx.Unlock()

diff --git a/config/config.go b/config/config.go
@@ -53,6 +53,7 @@ type Prest struct {
 	PGMaxIdleConn    int
 	PGMAxOpenConn    int
 	PGConnTimeout    int
+	PGCache          bool
 	JWTKey           string
 	JWTAlgo          string
 	JWTWhiteList     []string
@@ -65,7 +66,6 @@ type Prest struct {
 	Adapter          adapters.Adapter
 	EnableDefaultJWT bool
 	SingleDB         bool
-	EnableCache      bool
 	HTTPSMode        bool
 	HTTPSCert        string
 	HTTPSKey         string
@@ -107,12 +107,12 @@ func viperCfg() {
 	viper.SetDefault("pg.maxopenconn", 10)
 	viper.SetDefault("pg.conntimeout", 10)
 	viper.SetDefault("pg.single", true)
+	viper.SetDefault("pg.cache", true)
 	viper.SetDefault("debug", false)
 	viper.SetDefault("jwt.default", true)
 	viper.SetDefault("jwt.algo", "HS256")
 	viper.SetDefault("jwt.whitelist", []string{"/auth"})
 	viper.SetDefault("cors.allowheaders", []string{"*"})
-	viper.SetDefault("cache.enable", true)
 	viper.SetDefault("context", "/")
 	viper.SetDefault("https.mode", false)
 	viper.SetDefault("https.cert", "/etc/certs/cert.crt")
@@ -180,6 +180,7 @@ func Parse(cfg *Prest) (err error) {
 	cfg.PGMaxIdleConn = viper.GetInt("pg.maxidleconn")
 	cfg.PGMAxOpenConn = viper.GetInt("pg.maxopenconn")
 	cfg.PGConnTimeout = viper.GetInt("pg.conntimeout")
+	cfg.PGCache = viper.GetBool("pg.cache")
 	cfg.SingleDB = viper.GetBool("pg.single")
 	cfg.JWTKey = viper.GetString("jwt.key")
 	cfg.JWTAlgo = viper.GetString("jwt.algo")
@@ -192,7 +193,6 @@ func Parse(cfg *Prest) (err error) {
 	cfg.CORSAllowHeaders = viper.GetStringSlice("cors.allowheaders")
 	cfg.Debug = viper.GetBool("debug")
 	cfg.EnableDefaultJWT = viper.GetBool("jwt.default")
-	cfg.EnableCache = viper.GetBool("cache.enable")
 	cfg.ContextPath = viper.GetString("context")
 	cfg.HTTPSMode = viper.GetBool("https.mode")
 	cfg.HTTPSCert = viper.GetString("https.cert")