Skip to content

Commit 1a7382f

Browse files
committed
fix rebase and improve allocations in default logger
1 parent ca47b55 commit 1a7382f

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

conn_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ func TestStream0(t *testing.T) {
731731
session: &Session{
732732
types: GlobalTypes,
733733
},
734-
logger: newInternalLoggerFromStdLogger(&defaultLogger{}, LogLevelNone),
734+
logger: NewLogger(LogLevelNone),
735735
}
736736

737737
err := conn.recv(context.Background(), false)

logger.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,18 @@ func (l *defaultLogger) write(prefix string, msg string, fields []LogField) {
139139
func writeFields(buf *bytes.Buffer, fields []LogField) {
140140
for i, field := range fields {
141141
if i > 0 {
142-
buf.WriteString(strings.Join([]string{" ", field.Name, "=", field.Value.String()}, ""))
143-
} else {
144-
buf.WriteString(strings.Join([]string{field.Name, "=", field.Value.String()}, ""))
142+
buf.WriteRune(' ')
145143
}
144+
buf.WriteString(field.Name)
145+
buf.WriteRune('=')
146+
buf.WriteString(field.Value.String())
146147
}
147148
}
148149

149150
func writeLogMsg(buf *bytes.Buffer, prefix string, msg string, fields []LogField) {
150-
buf.WriteString(strings.Join([]string{prefix, msg, " "}, ""))
151+
buf.WriteString(prefix)
152+
buf.WriteString(msg)
153+
buf.WriteRune(' ')
151154
writeFields(buf, fields)
152155
}
153156

metadata_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestCompileMetadata(t *testing.T) {
4343
cfg: ClusterConfig{
4444
ProtoVersion: 1,
4545
},
46-
logger: newInternalLoggerFromStdLogger(&defaultLogger{}, LogLevelNone),
46+
logger: NewLogger(LogLevelNone),
4747
types: GlobalTypes,
4848
}
4949
// V2 test - V2+ protocol is simpler so here are some toy examples to verify that the mapping works
@@ -434,7 +434,7 @@ func assertParseNonCompositeType(
434434
cfg: ClusterConfig{
435435
ProtoVersion: 4,
436436
},
437-
logger: newInternalLoggerFromStdLogger(&defaultLogger{}, LogLevelNone),
437+
logger: NewLogger(LogLevelNone),
438438
types: GlobalTypes,
439439
}
440440
result, err := parseType(session, def)
@@ -475,7 +475,7 @@ func assertParseCompositeType(
475475
cfg: ClusterConfig{
476476
ProtoVersion: 4,
477477
},
478-
logger: newInternalLoggerFromStdLogger(&defaultLogger{}, LogLevelNone),
478+
logger: NewLogger(LogLevelNone),
479479
types: GlobalTypes,
480480
}
481481
result, err := parseType(session, def)

0 commit comments

Comments
 (0)