Add log_queries key to config

baking-bad · Jul 17, 2023 · f1527f7 · f1527f7
1 parent 100ee14
commit f1527f7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/configs/development.yml b/configs/development.yml
@@ -33,6 +33,7 @@ storage:
     password: ${POSTGRES_PASSWORD}
     sslmode: disable
   timeout: 10
+  log_queries: ${POSTGRES_LOG_QUERIES:-false}
 
 sentry:
   environment: development

diff --git a/configs/production.yml b/configs/production.yml
@@ -34,6 +34,7 @@ storage:
     password: ${POSTGRES_PASSWORD}
     sslmode: disable
   timeout: 10
+  log_queries: ${POSTGRES_LOG_QUERIES:-false}
 
 sentry:
   environment: production

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -72,8 +72,9 @@ type ServiceConfig struct {
 
 // StorageConfig -
 type StorageConfig struct {
-	Postgres PostgresConfig `yaml:"pg"`
-	Timeout  int            `yaml:"timeout"`
+	Postgres   PostgresConfig `yaml:"pg"`
+	Timeout    int            `yaml:"timeout"`
+	LogQueries bool           `yaml:"log_queries,omitempty"`
 }
 
 // PostgresConfig -

diff --git a/internal/config/options.go b/internal/config/options.go
@@ -50,13 +50,19 @@ func WithStorage(cfg StorageConfig, appName string, maxPageSize int64, maxConnCo
 			panic("Please set connection strings to storage in config")
 		}
 
-		conn := pgCore.WaitNew(
-			cfg.Postgres.ConnectionString(), ctx.Network.String(),
-			appName, cfg.Timeout,
+		opts := []pgCore.PostgresOption{
 			pgCore.WithPageSize(maxPageSize),
 			pgCore.WithIdleConnections(idleConnCount),
 			pgCore.WithMaxConnections(maxConnCount),
-			pgCore.WithQueryLogging(),
+		}
+
+		if cfg.LogQueries {
+			opts = append(opts, pgCore.WithQueryLogging())
+		}
+
+		conn := pgCore.WaitNew(
+			cfg.Postgres.ConnectionString(), ctx.Network.String(),
+			appName, cfg.Timeout, opts...,
 		)
 
 		contractStorage := contract.NewStorage(conn)