Use logging metadata when logging queries (vapor#266)

gwynne · web-flow · commit 0b72fa83b102 · 2024-05-29T12:14:54.000-05:00
Use logging metadata for logging queries
diff --git a/Sources/PostgresKit/PostgresDatabase+SQL.swift b/Sources/PostgresKit/PostgresDatabase+SQL.swift
@@ -45,7 +45,7 @@ extension PostgresSQLDatabase: SQLDatabase, PostgresDatabase {
         let (sql, binds) = self.serialize(query)
         
         if let queryLogLevel = self.queryLogLevel {
-            self.logger.log(level: queryLogLevel, "\(sql) [\(binds)]")
+            self.logger.log(level: queryLogLevel, "Executing query", metadata: ["sql": .string(sql), "binds": .array(binds.map { .string("\($0)") })])
         }
         return self.eventLoop.makeCompletedFuture {
             var bindings = PostgresBindings(capacity: binds.count)
@@ -69,7 +69,7 @@ extension PostgresSQLDatabase: SQLDatabase, PostgresDatabase {
         let (sql, binds) = self.serialize(query)
         
         if let queryLogLevel = self.queryLogLevel {
-            self.logger.log(level: queryLogLevel, "\(sql) [\(binds)]")
+            self.logger.log(level: queryLogLevel, "Executing query", metadata: ["sql": .string(sql), "binds": .array(binds.map { .string("\($0)") })])
         }
 
         var bindings = PostgresBindings(capacity: binds.count)

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ extension PostgresSQLDatabase: SQLDatabase, PostgresDatabase {`
`45`	`45`	`let (sql, binds) = self.serialize(query)`
`46`	`46`
`47`	`47`	`if let queryLogLevel = self.queryLogLevel {`
`48`		`- self.logger.log(level: queryLogLevel, "\(sql) [\(binds)]")`
	`48`	`+ self.logger.log(level: queryLogLevel, "Executing query", metadata: ["sql": .string(sql), "binds": .array(binds.map { .string("\($0)") })])`
`49`	`49`	`}`
`50`	`50`	`return self.eventLoop.makeCompletedFuture {`
`51`	`51`	`var bindings = PostgresBindings(capacity: binds.count)`
`@@ -69,7 +69,7 @@ extension PostgresSQLDatabase: SQLDatabase, PostgresDatabase {`
`69`	`69`	`let (sql, binds) = self.serialize(query)`
`70`	`70`
`71`	`71`	`if let queryLogLevel = self.queryLogLevel {`
`72`		`- self.logger.log(level: queryLogLevel, "\(sql) [\(binds)]")`
	`72`	`+ self.logger.log(level: queryLogLevel, "Executing query", metadata: ["sql": .string(sql), "binds": .array(binds.map { .string("\($0)") })])`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`var bindings = PostgresBindings(capacity: binds.count)`