From 878665a010f8a46818ab343e0025de68cce6e423 Mon Sep 17 00:00:00 2001 From: Jan Mussler Date: Thu, 29 Dec 2022 17:04:40 +0100 Subject: [PATCH 1/3] Enable logging of all operator statements --- pkg/cluster/database.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cluster/database.go b/pkg/cluster/database.go index f1ea736ce..24a7a0986 100644 --- a/pkg/cluster/database.go +++ b/pkg/cluster/database.go @@ -98,7 +98,7 @@ func (c *Cluster) pgConnectionString(dbname string) string { dbname = "postgres" } - return fmt.Sprintf("host='%s' dbname='%s' sslmode=require user='%s' password='%s' connect_timeout='%d'", + return fmt.Sprintf("host='%s' dbname='%s' sslmode=require user='%s' password='%s' connect_timeout='%d' options='-c log_statement%30all'", fmt.Sprintf("%s.%s.svc.%s", c.Name, c.Namespace, c.OpConfig.ClusterDomain), dbname, c.systemUsers[constants.SuperuserKeyName].Name, From 609517237e8c51a91b43a83da0b149dea3ddc129 Mon Sep 17 00:00:00 2001 From: Jan Mussler Date: Thu, 29 Dec 2022 17:06:50 +0100 Subject: [PATCH 2/3] Update database.go Wrong character --- pkg/cluster/database.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cluster/database.go b/pkg/cluster/database.go index 24a7a0986..449f60337 100644 --- a/pkg/cluster/database.go +++ b/pkg/cluster/database.go @@ -98,7 +98,7 @@ func (c *Cluster) pgConnectionString(dbname string) string { dbname = "postgres" } - return fmt.Sprintf("host='%s' dbname='%s' sslmode=require user='%s' password='%s' connect_timeout='%d' options='-c log_statement%30all'", + return fmt.Sprintf("host='%s' dbname='%s' sslmode=require user='%s' password='%s' connect_timeout='%d' options='-c log_statement%3Dall'", fmt.Sprintf("%s.%s.svc.%s", c.Name, c.Namespace, c.OpConfig.ClusterDomain), dbname, c.systemUsers[constants.SuperuserKeyName].Name, From 4968735b73b2043c136ce8c1720a6db143349cea Mon Sep 17 00:00:00 2001 From: Jan Mussler Date: Thu, 29 Dec 2022 17:35:17 +0100 Subject: [PATCH 3/3] Update database.go --- pkg/cluster/database.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/cluster/database.go b/pkg/cluster/database.go index 449f60337..a1726697a 100644 --- a/pkg/cluster/database.go +++ b/pkg/cluster/database.go @@ -97,13 +97,17 @@ func (c *Cluster) pgConnectionString(dbname string) string { if dbname == "" { dbname = "postgres" } + + // TODO add global config option for this + var options = "-c log_statement=all" - return fmt.Sprintf("host='%s' dbname='%s' sslmode=require user='%s' password='%s' connect_timeout='%d' options='-c log_statement%3Dall'", + return fmt.Sprintf("host='%s' dbname='%s' sslmode=require user='%s' password='%s' connect_timeout='%d' options='%s'", fmt.Sprintf("%s.%s.svc.%s", c.Name, c.Namespace, c.OpConfig.ClusterDomain), dbname, c.systemUsers[constants.SuperuserKeyName].Name, strings.Replace(password, "$", "\\$", -1), - constants.PostgresConnectTimeout/time.Second) + constants.PostgresConnectTimeout/time.Second, + options) } func (c *Cluster) databaseAccessDisabled() bool {